Upgrade Roundcube to 1.6 (hestiacp#2810)

* Merge "Roudcube" config files to common
* Add  /install/common/ folder to main.sh
* Upgrade RC to 1.6.0
* Update installers and use non ssl
* Also update "Update script" roundcube
* Rename 1.6.5 to 1.6.6

And add check to make sure it is localhost

Author: jaapmarcus

bin/v-add-sys-roundcube

@@ -46,7 +46,7 @@ if [ -z "$HESTIA" ]; then
     HESTIA="/usr/local/hestia"
 fi
 
-if [ -z "$HOMEDIR" ] || [ -z "$HESTIA_INSTALL_DIR" ]; then
+if [ -z "$HOMEDIR" ] || [ -z "$HESTIA_COMMON_DIR" ]; then
     echo "ERROR: Environment variables not present, installation aborted."
     exit 2
 fi
@@ -97,21 +97,21 @@ if [ "$UPDATE" == "no" ]; then
     rm -f -r $RC_INSTALL_DIR/config/
     ln -s $RC_CONFIG_DIR/ ./config
     # Replace with Hestia config
-    cp -f $HESTIA_INSTALL_DIR/roundcube/main.inc.php $RC_CONFIG_DIR/config.inc.php
-    cp -f $HESTIA_INSTALL_DIR/roundcube/mimetypes.php $RC_CONFIG_DIR/mimetypes.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/main.inc.php $RC_CONFIG_DIR/config.inc.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/mimetypes.php $RC_CONFIG_DIR/mimetypes.php
     chmod 644 $RC_CONFIG_DIR/*.php
 
-    cp -f $HESTIA_INSTALL_DIR/roundcube/hestia.php $RC_INSTALL_DIR/plugins/password/drivers/
+    cp -f $HESTIA_COMMON_DIR/roundcube/hestia.php $RC_INSTALL_DIR/plugins/password/drivers/
     mkdir -p $RC_CONFIG_DIR/plugins/password
     mkdir -p $RC_CONFIG_DIR/plugins/newmail_notifier
     mkdir -p $RC_CONFIG_DIR/plugins/zipdownload
 
     # Allow changes to the respective config / Create symlinks to /etc/roundcube/ 
-    cp -f $HESTIA_INSTALL_DIR/roundcube/config.inc.php $RC_CONFIG_DIR/plugins/password/config.inc.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/config.inc.php $RC_CONFIG_DIR/plugins/password/config.inc.php
     ln -s $RC_CONFIG_DIR/plugins/password/config.inc.php ./plugins/password/config.inc.php
-    cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_newmail_notifier.inc.php $RC_CONFIG_DIR/plugins/newmail_notifier/config.inc.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/plugins/config_newmail_notifier.inc.php $RC_CONFIG_DIR/plugins/newmail_notifier/config.inc.php
     ln -s $RC_CONFIG_DIR/plugins/newmail_notifier/config.inc.php ./plugins/newmail_notifier/config.inc.php
-    cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_zipdownload.inc.php $RC_CONFIG_DIR/plugins/zipdownload/config.inc.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/plugins/config_zipdownload.inc.php $RC_CONFIG_DIR/plugins/zipdownload/config.inc.php
     ln -s $RC_CONFIG_DIR/plugins/zipdownload/config.inc.php ./plugins/zipdownload/config.inc.php
 
     # Set up correct permissions roundcube    

func/main.sh

@@ -14,7 +14,8 @@ BACKUP_DISK_LIMIT=95
 BACKUP_LA_LIMIT=`cat /proc/cpuinfo | grep processor | wc -l`
 RRD_STEP=300
 BIN=$HESTIA/bin
-HESTIA_INSTALL_DIR=$HESTIA/install/deb
+HESTIA_INSTALL_DIR="$HESTIA/install/deb"
+HESTIA_COMMON_DIR="$HESTIA/install/common"
 HESTIA_BACKUP="/root/hst_backups/$(date +%d%m%Y%H%M)"
 USER_DATA=$HESTIA/data/users/$user
 WEBTPL=$HESTIA/data/templates/web

install/deb/roundcube/apache.conf install/common/roundcube/apache.confinstall/deb/roundcube/apache.conf renamed to install/common/roundcube/apache.conf

@@ -29,10 +29,7 @@
 // For example %n = mail.domain.tld, %t = domain.tld
 // WARNING: After hostname change update of mail_host column in users table is
 //          required to match old user data records with the new host.
-$config['default_host'] = 'ssl://localhost';
-
-// TCP port used for IMAP connections
-$config['default_port'] = 993;
+$config['imap_host'] = 'localhost:143';
 
 // IMAP socket context options
 // See http://php.net/manual/en/context.ssl.php
@@ -103,7 +100,7 @@
 
 $config['default_pass'] = '%p';
 
-$config['smtp_host'] = 'ssl://localhost';
+$config['smtp_host'] = 'localhost:587';
 
 // Log session authentication errors to <log_dir>/session or to syslog
 $config['log_session'] = true;

install/deb/roundcube/config.inc.php install/common/roundcube/config.inc.phpinstall/deb/roundcube/config.inc.php renamed to install/common/roundcube/config.inc.php

@@ -1,16 +1,12 @@
 <?php
 
-// managesieve server port. When empty the port will be determined automatically
-// using getservbyname() function, with 4190 as a fallback.
-$config['managesieve_port'] = 4190;
-
 // managesieve server address, default is localhost.
 // Replacement variables supported in host name:
 // %h - user's IMAP hostname
 // %n - http hostname ($_SERVER['SERVER_NAME'])
 // %d - domain (http hostname without the first part)
 // For example %n = mail.domain.tld, %d = domain.tld
-$config['managesieve_host'] = 'localhost';
+$config['managesieve_host'] = 'localhost:4190';
 
 // authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL
 // or none. Optional, defaults to best method supported by server.