mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-02 15:21:43 +01:00
53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
diff --git a/installer/index.php b/installer/index.php
|
|
index 7ed5224..f9f8241 100644
|
|
--- a/installer/index.php
|
|
+++ b/installer/index.php
|
|
@@ -32,7 +32,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE);
|
|
ini_set('display_errors', 1);
|
|
|
|
define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
|
|
-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
|
|
+define('RCMAIL_CONFIG_DIR', '/etc/roundcube');
|
|
|
|
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
|
|
$include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
|
|
diff --git a/program/include/iniset.php b/program/include/iniset.php
|
|
index 10ae11e..f9d3d92 100755
|
|
--- a/program/include/iniset.php
|
|
+++ b/program/include/iniset.php
|
|
@@ -47,7 +47,7 @@ if (!defined('INSTALL_PATH')) {
|
|
}
|
|
|
|
if (!defined('RCMAIL_CONFIG_DIR')) {
|
|
- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
|
|
+ define('RCMAIL_CONFIG_DIR', '/etc/roundcube');
|
|
}
|
|
|
|
// make sure path_separator is defined
|
|
diff --git a/program/include/main.inc b/program/include/main.inc
|
|
index 30d9099..8400395 100644
|
|
--- a/program/include/main.inc
|
|
+++ b/program/include/main.inc
|
|
@@ -2101,7 +2101,7 @@ function write_log($name, $line)
|
|
|
|
// log_driver == 'file' is assumed here
|
|
if (empty($CONFIG['log_dir']))
|
|
- $CONFIG['log_dir'] = INSTALL_PATH.'logs';
|
|
+ $CONFIG['log_dir'] = '/var/log/roundcube';
|
|
|
|
// try to open specific log file for writing
|
|
$logfile = $CONFIG['log_dir'].'/'.$name;
|
|
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
|
|
index 7d46df0..d9990c4 100644
|
|
--- a/program/include/rcube_config.php
|
|
+++ b/program/include/rcube_config.php
|
|
@@ -66,7 +66,7 @@ class rcube_config
|
|
|
|
// fix paths
|
|
$this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
|
|
- $this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : INSTALL_PATH . 'temp';
|
|
+ $this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : '/tmp';
|
|
|
|
// fix default imap folders encoding
|
|
foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
|