Sync up config files

remove non needed config file

install/common/roundcube/db.inc.php

@@ -62,5 +62,4 @@ $rcmail_config['db_sequence_cache'] = 'cache_ids';
 $rcmail_config['db_sequence_messages'] = 'message_ids';
 
 
-// end db config file
-?>
+// end db config file

install/deb/roundcube/main.inc.php

@@ -1,107 +0,0 @@
-<?php
-/* Local configuration for Roundcube Webmail */
-
-//rewrite below this line
-$config['db_dsnw'] = 'mysql://roundcube:%password%@localhost/roundcube';
-
-// Log sent messages to <log_dir>/sendmail or to syslog
-$config['smtp_log'] = false;
-
-// Log IMAP conversation to <log_dir>/imap or to syslog
-$config['imap_debug'] = true;
-
-// Log SMTP conversation to <log_dir>/smtp.log or to syslog
-$config['smtp_debug'] = true;
-
-// ----------------------------------
-// IMAP
-// ----------------------------------
-// The IMAP host chosen to perform the log-in.
-// Leave blank to show a textbox at login, give a list of hosts
-// to display a pulldown menu or set one host as string.
-// Enter hostname with prefix ssl:// to use Implicit TLS, or use
-// prefix tls:// to use STARTTLS.
-// Supported replacement variables:
-// %n - hostname ($_SERVER['SERVER_NAME'])
-// %t - hostname without the first part
-// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
-// %s - domain name after the '@' from e-mail address provided at login screen
-// 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['imap_host'] = 'localhost:143';
-
-// IMAP socket context options
-// See http://php.net/manual/en/context.ssl.php
-// The example below enables server certificate validation
-//$config['imap_conn_options'] = array(
-//  'ssl'         => array(
-//     'verify_peer'  => true,
-//     'verify_depth' => 3,
-//     'cafile'       => '/etc/openssl/certs/ca.crt',
-//   ),
-// );
-// Note: These can be also specified as an array of options indexed by hostname
-$config['imap_conn_options'] = array (
-  'ssl' => 
-  array (
-    'verify_peer' => false,
-    'verify_peer_name' => false,
-    'verify_depth' => 3,
-    'cafile' => '/etc/ssl/certs/ca-certificates.crt',
-  ),
-);
-
-// SMTP socket context options
-// See http://php.net/manual/en/context.ssl.php
-// The example below enables server certificate validation, and
-// requires 'smtp_timeout' to be non zero.
-// $config['smtp_conn_options'] = array(
-//   'ssl'         => array(
-//     'verify_peer'  => true,
-//     'verify_depth' => 3,
-//     'cafile'       => '/etc/openssl/certs/ca.crt',
-//   ),
-// );
-// Note: These can be also specified as an array of options indexed by hostname
-$config['smtp_conn_options'] = array (
-  'ssl' => 
-  array (
-    'verify_peer' => false,
-    'verify_peer_name' => false,
-    'verify_depth' => 3,
-    'cafile' => '/etc/ssl/certs/ca-certificates.crt',
-  ),
-);
-
-// provide an URL where a user can get support for this Roundcube installation
-// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
-$config['support_url'] = '';
-
-// use this folder to store log files
-// must be writeable for the user who runs PHP process (Apache user if mod_php is being used)
-// This is used by the 'file' log driver.
-$config['log_dir'] = '/var/log/roundcube/';
-
-// This key is used for encrypting purposes, like storing of imap password
-// in the session. For historical reasons it's called DES_key, but it's used
-// with any configured cipher_method (see below).
-// For the default cipher_method a required key length is 24 characters.
-$config['des_key'] = '%des_key%';
-
-// Maximum number of recipients per message (including To, Cc, Bcc).
-// Default: 0 (no limit)
-$config['max_recipients'] = 100;
-
-// List of active plugins (in plugins/ directory)
-$config['plugins'] = array('password', 'newmail_notifier', 'zipdownload', 'archive');
-
-$config['default_user'] = '%u';
-
-$config['default_pass'] = '%p';
-
-$config['smtp_host'] = 'localhost:587';
-
-// Log session authentication errors to <log_dir>/session or to syslog
-$config['log_session'] = true;
-?>

install/upgrade/versions/unreleased.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version unknow
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+####### Pass through information to the end user in case of a issue or problem  #######
+#######                                                                         #######
+####### Use add_upgrade_message "My message here" to include a message          #######
+####### in the upgrade notification email. Example:                             #######
+#######                                                                         #######
+####### add_upgrade_message "My message here"                                   #######
+#######                                                                         #######
+####### You can use \n within the string to create new lines.                   #######
+#######################################################################################
+
+upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'no'
+upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
+
+# make sure to sync install qouteshellarg
+$HESTIA/bin/v-add-sys-phpmailer
+if [ "$FILE_MANAGER" = "true" ]; then
+    # Sync up filemanger
+    $HESTIA/bin/v-delete-sys-filemanger
+    $HESTIA/bin/v-add-sys-filemanger        
+fi
+
+# Sync up config files #2819
+if [ -f "/etc/roundcube/config.inc.php" ]; then
+    sed -i "s/?>//" /etc/roundcube/config.inc.php
+    sed -i "s/?>//" /etc/roundcube/db.inc.php
+    sed -i "s/?>//" /etc/roundcube/minetypes.inc.php     
+fi