2012-08-25 23:09:15 +02:00
|
|
|
diff --git a/installer/index.php b/installer/index.php
|
2012-11-10 22:33:37 +01:00
|
|
|
index 4c94fea..204cdf4 100644
|
2012-08-25 23:09:15 +02:00
|
|
|
--- a/installer/index.php
|
|
|
|
+++ b/installer/index.php
|
|
|
|
@@ -43,7 +43,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE);
|
2011-02-21 15:47:06 +01:00
|
|
|
ini_set('display_errors', 1);
|
|
|
|
|
|
|
|
define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
|
|
|
|
-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
|
|
|
|
+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
|
2012-11-10 22:33:37 +01:00
|
|
|
define('RCMAIL_CHARSET', 'UTF-8');
|
2011-02-21 15:47:06 +01:00
|
|
|
|
|
|
|
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
|
2012-08-25 23:09:15 +02:00
|
|
|
diff --git a/program/include/iniset.php b/program/include/iniset.php
|
2012-11-10 23:35:58 +01:00
|
|
|
index 3809479..5004448 100644
|
2012-08-25 23:09:15 +02:00
|
|
|
--- a/program/include/iniset.php
|
|
|
|
+++ b/program/include/iniset.php
|
2012-11-10 23:35:58 +01:00
|
|
|
@@ -52,7 +52,7 @@ if (!defined('INSTALL_PATH')) {
|
2008-09-23 13:17:36 +02:00
|
|
|
}
|
|
|
|
|
2012-11-10 23:35:58 +01:00
|
|
|
if (!defined('RCMAIL_CONFIG_DIR')) {
|
2010-11-24 22:11:15 +01:00
|
|
|
- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
|
2012-11-10 23:35:58 +01:00
|
|
|
+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
|
|
|
|
}
|
|
|
|
|
2008-09-23 13:17:36 +02:00
|
|
|
// make sure path_separator is defined
|