diff options
Diffstat (limited to 'roundcubemail-1.4-confpath.patch')
| -rw-r--r-- | roundcubemail-1.4-confpath.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/roundcubemail-1.4-confpath.patch b/roundcubemail-1.4-confpath.patch index 4c0240c..5b53a8c 100644 --- a/roundcubemail-1.4-confpath.patch +++ b/roundcubemail-1.4-confpath.patch @@ -1,7 +1,7 @@ diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php ---- ./config/defaults.inc.php.rpm 2018-08-24 21:42:24.000000000 +0200 -+++ ./config/defaults.inc.php 2018-09-17 15:27:15.758441986 +0200 -@@ -404,11 +404,11 @@ $config['user_aliases'] = false; +--- ./config/defaults.inc.php.rpm 2019-09-16 21:57:38.000000000 +0200 ++++ ./config/defaults.inc.php 2019-09-17 06:50:40.861838220 +0200 +@@ -413,11 +413,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. @@ -15,7 +15,7 @@ diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php // expire files in temp_dir after 48 hours // possible units: s, m, h, d, w -@@ -632,7 +632,7 @@ $config['mime_magic'] = null; +@@ -637,7 +637,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 @@ -24,7 +24,7 @@ diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php // path to imagemagick identify binary (if not set we'll use Imagick or GD extensions) $config['im_identify_path'] = null; -@@ -1265,3 +1265,7 @@ $config['message_show_email'] = false; +@@ -1264,3 +1264,7 @@ $config['message_show_email'] = false; // 0 - Reply-All always // 1 - Reply-List if mailing list is detected $config['reply_all_mode'] = 0; @@ -33,8 +33,8 @@ diff -up ./config/defaults.inc.php.rpm ./config/defaults.inc.php +// 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 2018-09-17 15:22:35.041631063 +0200 -+++ ./plugins/enigma/config.inc.php.dist 2018-09-17 15:23:04.918823805 +0200 +--- ./plugins/enigma/config.inc.php.dist.rpm 2019-09-16 21:57:38.000000000 +0200 ++++ ./plugins/enigma/config.inc.php.dist 2019-09-17 06:50:40.861838220 +0200 @@ -12,10 +12,6 @@ $config['enigma_smime_driver'] = 'phpssl // Enables logging of enigma operations (including Crypt_GPG debug info) $config['enigma_debug'] = false; @@ -47,18 +47,18 @@ diff -up ./plugins/enigma/config.inc.php.dist.rpm ./plugins/enigma/config.inc.ph // 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 2018-08-24 21:42:26.000000000 +0200 -+++ ./program/include/iniset.php 2018-09-17 15:22:35.041631063 +0200 -@@ -29,7 +29,7 @@ if (!defined('INSTALL_PATH')) { +--- ./program/include/iniset.php.rpm 2019-09-16 21:57:39.000000000 +0200 ++++ ./program/include/iniset.php 2019-09-17 06:53:23.289881898 +0200 +@@ -28,7 +28,7 @@ if (!defined('INSTALL_PATH')) { } if (!defined('RCMAIL_CONFIG_DIR')) { -- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); +- define('RCMAIL_CONFIG_DIR', getenv('ROUNDCUBE_CONFIG_DIR') ?: (INSTALL_PATH . 'config')); + define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); } if (!defined('RCUBE_LOCALIZATION_DIR')) { -@@ -37,7 +37,7 @@ if (!defined('RCUBE_LOCALIZATION_DIR')) +@@ -36,7 +36,7 @@ if (!defined('RCUBE_LOCALIZATION_DIR')) } define('RCUBE_INSTALL_PATH', INSTALL_PATH); @@ -68,9 +68,9 @@ diff -up ./program/include/iniset.php.rpm ./program/include/iniset.php // RC include folders MUST be included FIRST to avoid other diff -up ./program/lib/Roundcube/bootstrap.php.rpm ./program/lib/Roundcube/bootstrap.php ---- ./program/lib/Roundcube/bootstrap.php.rpm 2018-08-24 21:42:27.000000000 +0200 -+++ ./program/lib/Roundcube/bootstrap.php 2018-09-17 15:22:35.041631063 +0200 -@@ -69,7 +69,7 @@ if (!defined('RCUBE_INSTALL_PATH')) { +--- ./program/lib/Roundcube/bootstrap.php.rpm 2019-09-16 21:57:39.000000000 +0200 ++++ ./program/lib/Roundcube/bootstrap.php 2019-09-17 06:50:40.861838220 +0200 +@@ -71,7 +71,7 @@ if (!defined('RCUBE_INSTALL_PATH')) { } if (!defined('RCUBE_CONFIG_DIR')) { |