| 1 |
brianr |
1.1 |
diff -up roundcubemail-1.1.0/config/defaults.inc.php.orig roundcubemail-1.1.0/config/defaults.inc.php |
| 2 |
|
|
--- roundcubemail-1.1.0/config/defaults.inc.php.orig 2015-02-16 17:39:52.274132735 +0100 |
| 3 |
|
|
+++ roundcubemail-1.1.0/config/defaults.inc.php 2015-02-16 17:46:10.336534781 +0100 |
| 4 |
|
|
@@ -321,11 +321,11 @@ $config['user_aliases'] = false; |
| 5 |
|
|
// use this folder to store log files |
| 6 |
|
|
// must be writeable for the user who runs PHP process (Apache user if mod_php is being used) |
| 7 |
|
|
// This is used by the 'file' log driver. |
| 8 |
|
|
-$config['log_dir'] = RCUBE_INSTALL_PATH . 'logs/'; |
| 9 |
|
|
+$config['log_dir'] = '/var/log/roundcubemail/'; |
| 10 |
|
|
|
| 11 |
|
|
// use this folder to store temp files |
| 12 |
|
|
// must be writeable for the user who runs PHP process (Apache user if mod_php is being used) |
| 13 |
|
|
-$config['temp_dir'] = RCUBE_INSTALL_PATH . 'temp/'; |
| 14 |
|
|
+$config['temp_dir'] = '/var/lib/roundcubemail/'; |
| 15 |
|
|
|
| 16 |
|
|
// expire files in temp_dir after 48 hours |
| 17 |
|
|
// possible units: s, m, h, d, w |
| 18 |
|
|
@@ -511,7 +511,7 @@ $config['mime_magic'] = null; |
| 19 |
|
|
// This is used to derive mime-types from the filename extension or vice versa. |
| 20 |
|
|
// Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system, |
| 21 |
|
|
// download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types |
| 22 |
|
|
-$config['mime_types'] = null; |
| 23 |
|
|
+$config['mime_types'] = '/etc/mime.types'; |
| 24 |
|
|
|
| 25 |
|
|
// path to imagemagick identify binary (if not set we'll use Imagick or GD extensions) |
| 26 |
|
|
$config['im_identify_path'] = null; |
| 27 |
|
|
diff -up roundcubemail-1.1.0/installer/index.php.orig roundcubemail-1.1.0/installer/index.php |
| 28 |
|
|
--- roundcubemail-1.1.0/installer/index.php.orig 2015-02-16 17:39:52.274132735 +0100 |
| 29 |
|
|
+++ roundcubemail-1.1.0/installer/index.php 2015-02-16 17:41:44.115547278 +0100 |
| 30 |
|
|
@@ -41,7 +41,7 @@ ini_set('display_errors', 1); |
| 31 |
|
|
|
| 32 |
|
|
define('INSTALL_PATH', realpath(__DIR__ . '/../').'/'); |
| 33 |
|
|
define('RCUBE_INSTALL_PATH', INSTALL_PATH); |
| 34 |
|
|
-define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/'); |
| 35 |
|
|
+define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); |
| 36 |
|
|
|
| 37 |
|
|
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; |
| 38 |
|
|
$include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR; |
| 39 |
|
|
diff -up roundcubemail-1.1.0/program/include/iniset.php.orig roundcubemail-1.1.0/program/include/iniset.php |
| 40 |
|
|
--- roundcubemail-1.1.0/program/include/iniset.php.orig 2015-02-08 14:48:56.000000000 +0100 |
| 41 |
|
|
+++ roundcubemail-1.1.0/program/include/iniset.php 2015-02-16 17:39:52.274132735 +0100 |
| 42 |
|
|
@@ -29,7 +29,7 @@ if (!defined('INSTALL_PATH')) { |
| 43 |
|
|
} |
| 44 |
|
|
|
| 45 |
|
|
if (!defined('RCMAIL_CONFIG_DIR')) { |
| 46 |
|
|
- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); |
| 47 |
|
|
+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); |
| 48 |
|
|
} |
| 49 |
|
|
|
| 50 |
|
|
if (!defined('RCUBE_LOCALIZATION_DIR')) { |
| 51 |
|
|
@@ -37,7 +37,7 @@ if (!defined('RCUBE_LOCALIZATION_DIR')) |
| 52 |
|
|
} |
| 53 |
|
|
|
| 54 |
|
|
define('RCUBE_INSTALL_PATH', INSTALL_PATH); |
| 55 |
|
|
-define('RCUBE_CONFIG_DIR', RCMAIL_CONFIG_DIR.'/'); |
| 56 |
|
|
+define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); |
| 57 |
|
|
|
| 58 |
|
|
|
| 59 |
|
|
// RC include folders MUST be included FIRST to avoid other |
| 60 |
|
|
diff -up roundcubemail-1.1.0/program/lib/Roundcube/bootstrap.php.orig roundcubemail-1.1.0/program/lib/Roundcube/bootstrap.php |
| 61 |
|
|
--- roundcubemail-1.1.0/program/lib/Roundcube/bootstrap.php.orig 2015-02-08 14:48:56.000000000 +0100 |
| 62 |
|
|
+++ roundcubemail-1.1.0/program/lib/Roundcube/bootstrap.php 2015-02-16 17:39:52.274132735 +0100 |
| 63 |
|
|
@@ -66,7 +66,7 @@ if (!defined('RCUBE_INSTALL_PATH')) { |
| 64 |
|
|
} |
| 65 |
|
|
|
| 66 |
|
|
if (!defined('RCUBE_CONFIG_DIR')) { |
| 67 |
|
|
- define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config/'); |
| 68 |
|
|
+ define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); |
| 69 |
|
|
} |
| 70 |
|
|
|
| 71 |
|
|
if (!defined('RCUBE_PLUGINS_DIR')) { |
Parent Directory
| 
Revision Log
| 
Revision Graph
