diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php --- ./config/defaults.inc.php.rpm 2021-02-25 20:37:25.000000000 +0100 +++ ./config/defaults.inc.php 2021-04-22 10:52:01.854393745 +0200 @@ -517,11 +517,11 @@ $config['user_aliases'] = false; // 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'] = RCUBE_INSTALL_PATH . 'logs/'; +$config['log_dir'] = '/var/log/roundcubemail/'; // Location of temporary saved files such as attachments and cache files // must be writeable for the user who runs PHP process (Apache user if mod_php is being used) -$config['temp_dir'] = RCUBE_INSTALL_PATH . 'temp/'; +$config['temp_dir'] = '/var/lib/roundcubemail/temp/'; // expire files in temp_dir after 48 hours // possible units: s, m, h, d, w @@ -751,7 +751,7 @@ $config['mime_magic'] = null; // This is used to derive mime-types from the filename extension or vice versa. // Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system, // download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types -$config['mime_types'] = null; +$config['mime_types'] = '/etc/mime.types'; // path to imagemagick identify binary (if not set we'll use Imagick or GD extensions) $config['im_identify_path'] = null; @@ -1417,3 +1417,7 @@ $config['message_show_email'] = false; // 0 - Reply-All always // 1 - Reply-List if mailing list is detected $config['reply_all_mode'] = 0; + +// Keys directory for all users. +// Must be writeable by PHP process, and not in the web server document root +$config['enigma_pgp_homedir'] = '/var/lib/roundcubemail/enigma'; diff -up ./plugins/enigma/config.inc.php.dist.rpm ./plugins/enigma/config.inc.php.dist --- ./plugins/enigma/config.inc.php.dist.rpm 2021-02-25 20:37:25.000000000 +0100 +++ ./plugins/enigma/config.inc.php.dist 2021-04-22 10:49:25.686954741 +0200 @@ -12,10 +12,6 @@ $config['enigma_smime_driver'] = 'phpssl // Enables logging of enigma operations (including Crypt_GPG debug info) $config['enigma_debug'] = false; -// REQUIRED! Keys directory for all users. -// Must be writeable by PHP process, and not in the web server document root -$config['enigma_pgp_homedir'] = null; - // Location of gpg binary. By default it will be auto-detected. // This is also a way to force gpg2 use if there are both 1.x and 2.x on the system. $config['enigma_pgp_binary'] = ''; diff -up ./program/include/iniset.php.rpm ./program/include/iniset.php --- ./program/include/iniset.php.rpm 2021-02-25 20:37:26.000000000 +0100 +++ ./program/include/iniset.php 2021-04-22 10:53:09.427158482 +0200 @@ -28,7 +28,7 @@ if (!defined('INSTALL_PATH')) { } if (!defined('RCMAIL_CONFIG_DIR')) { - define('RCMAIL_CONFIG_DIR', getenv('ROUNDCUBE_CONFIG_DIR') ?: (INSTALL_PATH . 'config')); + define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); } if (!defined('RCUBE_LOCALIZATION_DIR')) { @@ -36,7 +36,7 @@ if (!defined('RCUBE_LOCALIZATION_DIR')) } define('RCUBE_INSTALL_PATH', INSTALL_PATH); -define('RCUBE_CONFIG_DIR', RCMAIL_CONFIG_DIR.'/'); +define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); // Show basic error message on fatal PHP error register_shutdown_function('rcmail_fatal_error'); diff -up ./program/lib/Roundcube/bootstrap.php.rpm ./program/lib/Roundcube/bootstrap.php --- ./program/lib/Roundcube/bootstrap.php.rpm 2021-02-25 20:37:26.000000000 +0100 +++ ./program/lib/Roundcube/bootstrap.php 2021-04-22 10:49:25.686954741 +0200 @@ -71,7 +71,7 @@ if (!defined('RCUBE_INSTALL_PATH')) { } if (!defined('RCUBE_CONFIG_DIR')) { - define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config/'); + define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); } if (!defined('RCUBE_PLUGINS_DIR')) {