2012-08-25 23:09:15 +02:00
|
|
|
diff --git a/installer/index.php b/installer/index.php
|
2013-04-28 20:10:12 +02:00
|
|
|
index 0e80b1c..0123a70 100644
|
2012-08-25 23:09:15 +02:00
|
|
|
--- a/installer/index.php
|
|
|
|
+++ b/installer/index.php
|
2013-04-27 18:29:44 +02:00
|
|
|
@@ -41,7 +41,7 @@ ini_set('display_errors', 1);
|
2011-02-21 15:47:06 +01:00
|
|
|
|
|
|
|
define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
|
2013-04-27 18:29:44 +02:00
|
|
|
define('RCUBE_INSTALL_PATH', INSTALL_PATH);
|
|
|
|
-define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/');
|
2013-04-28 20:10:12 +02:00
|
|
|
+define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/');
|
2011-02-21 15:47:06 +01:00
|
|
|
|
|
|
|
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
|
2013-04-27 18:29:44 +02:00
|
|
|
$include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
|
2012-08-25 23:09:15 +02:00
|
|
|
diff --git a/program/include/iniset.php b/program/include/iniset.php
|
2013-06-08 09:44:22 +02:00
|
|
|
index ca17640..b6da3a6 100644
|
2012-08-25 23:09:15 +02:00
|
|
|
--- a/program/include/iniset.php
|
|
|
|
+++ b/program/include/iniset.php
|
2013-06-08 09:44:22 +02:00
|
|
|
@@ -29,7 +29,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');
|
2013-04-28 20:10:12 +02:00
|
|
|
+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail/');
|
2012-11-10 23:35:58 +01:00
|
|
|
}
|
|
|
|
|
2013-04-27 18:29:44 +02:00
|
|
|
if (!defined('RCUBE_LOCALIZATION_DIR')) {
|