]>
Commit | Line | Data |
---|---|---|
7a906e31 ER |
1 | --- eventum-3.0.0/init.php~ 2015-02-02 20:02:01.825332859 +0200 |
2 | +++ eventum-3.0.0/init.php 2015-02-02 20:03:12.610911011 +0200 | |
098cbb72 | 3 | @@ -27,7 +27,7 @@ |
bc46f6d4 | 4 | // | Authors: Elan Ruusamäe <glen@delfi.ee> | |
31dabce6 ER |
5 | // +----------------------------------------------------------------------+ |
6 | ||
098cbb72 | 7 | -if (!file_exists(dirname(__FILE__) . '/config/config.php') || !filesize(dirname(__FILE__) . '/config/config.php')) { |
aa4e445d | 8 | +if (!file_exists('/etc/webapps/eventum/config.php') || !filesize('/etc/webapps/eventum/config.php')) { |
31dabce6 | 9 | Header('Location: setup/'); |
098cbb72 | 10 | exit(0); |
bc46f6d4 | 11 | } |
b366b3c3 | 12 | @@ -47,7 +47,7 @@ |
31dabce6 | 13 | // define base path |
ae3e48e6 | 14 | define('APP_PATH', realpath(dirname(__FILE__))); |
b366b3c3 ER |
15 | if (!defined('APP_CONFIG_PATH')) { |
16 | - define('APP_CONFIG_PATH', APP_PATH . '/config'); | |
17 | + define('APP_CONFIG_PATH', '/etc/webapps/eventum'); | |
18 | } | |
6c5cabb4 | 19 | |
ae3e48e6 | 20 | // include local site config. may override any default |
7a906e31 ER |
21 | --- eventum-3.0.0/init.php~ 2015-02-02 20:02:01.825332859 +0200 |
22 | +++ eventum-3.0.0/init.php 2015-02-02 20:03:12.610911011 +0200 | |
23 | @@ -78,7 +78,7 @@ | |
31dabce6 | 24 | } |
6c5cabb4 | 25 | |
ae3e48e6 ER |
26 | if (!defined('APP_TPL_COMPILE_PATH')) { |
27 | - define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c'); | |
28 | + define('APP_TPL_COMPILE_PATH', '/var/cache/eventum'); | |
31dabce6 | 29 | } |
9ff5b0e3 | 30 | |
ae3e48e6 | 31 | if (!defined('APP_INC_PATH')) { |
ae3e48e6 | 32 | @@ -81,7 +77,7 @@ |
31dabce6 | 33 | } |
3955d156 | 34 | |
31dabce6 | 35 | if (!defined('APP_LOCKS_PATH')) { |
ae3e48e6 | 36 | - define('APP_LOCKS_PATH', APP_PATH . '/locks'); |
31dabce6 ER |
37 | + define('APP_LOCKS_PATH', '/var/run/eventum/'); |
38 | } | |
3955d156 | 39 | |
bc46f6d4 | 40 | if (!defined('APP_SQL_PATCHES_PATH')) { |
ae3e48e6 | 41 | @@ -89,7 +85,7 @@ |
3955d156 ER |
42 | } |
43 | ||
31dabce6 | 44 | if (!defined('APP_LOG_PATH')) { |
ae3e48e6 ER |
45 | - define('APP_LOG_PATH', APP_PATH . '/logs'); |
46 | + define('APP_LOG_PATH', '/var/log/eventum'); | |
31dabce6 | 47 | } |
3955d156 | 48 | |
bc46f6d4 | 49 | if (!defined('APP_ROUTED_MAILS_SAVEDIR')) { |
7a906e31 ER |
50 | --- eventum-3.0.0/htdocs/setup/index.php~ 2015-02-02 20:03:49.507010317 +0200 |
51 | +++ eventum-3.0.0/htdocs/setup/index.php 2015-02-02 20:05:00.139257552 +0200 | |
52 | @@ -44,10 +44,10 @@ | |
53 | define('APP_CONFIG_PATH', APP_PATH . '/config'); | |
ae3e48e6 ER |
54 | define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php'); |
55 | define('APP_TPL_PATH', APP_PATH . '/templates'); | |
56 | -define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c'); | |
57 | -define('APP_LOG_PATH', APP_PATH . '/logs'); | |
31dabce6 | 58 | +define('APP_TPL_COMPILE_PATH', '/var/cache/eventum'); |
ae3e48e6 ER |
59 | +define('APP_LOG_PATH', '/var/log/eventum'); |
60 | define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log'); | |
61 | -define('APP_LOCKS_PATH', APP_PATH . '/locks'); | |
62 | +define('APP_LOCKS_PATH', '/var/run/eventum'); | |
7a906e31 | 63 | define('APP_LOCAL_PATH', APP_CONFIG_PATH); |
31dabce6 | 64 | |
ae3e48e6 | 65 | header('Content-Type: text/html; charset=' . APP_CHARSET); |
899100ff ER |
66 | @@ -254,10 +254,6 @@ |
67 | $errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly."; | |
452347b6 | 68 | } |
abac5638 | 69 | |
899100ff | 70 | - $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", true); |
31dabce6 ER |
71 | - if (!empty($error)) { |
72 | - $errors[] = $error; | |
73 | - } | |
098cbb72 | 74 | $error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'"); |
31dabce6 ER |
75 | if (!empty($error)) { |
76 | $errors[] = $error; | |
74c64201 ER |
77 | --- eventum-2.2/irc/eventum-irc-bot.php~ 2009-07-23 14:03:41.422211655 +0300 |
78 | +++ eventum-2.2/irc/eventum-irc-bot.php 2009-07-23 13:54:22.000000000 +0300 | |
b33d41f0 ER |
79 | @@ -32,7 +32,7 @@ |
80 | ||
81 | ini_set('memory_limit', '1024M'); | |
82 | ||
83 | -require_once dirname(__FILE__) . '/../init.php'; | |
84 | +require_once '/usr/share/eventum/init.php'; | |
85 | ||
86 | if (!file_exists(APP_CONFIG_PATH . '/irc_config.php')) { | |
87 | fwrite(STDERR, "ERROR: No config specified. Please see setup/irc_config.php for config information.\n\n"); | |
7a906e31 ER |
88 | --- eventum/bin/monitor.php 2010-11-24 17:24:23.000000000 +0200 |
89 | +++ eventum/bin/monitor.php 2010-11-24 18:23:09.664934996 +0200 | |
97f6bb1b ER |
90 | @@ -37,17 +37,17 @@ |
91 | $required_files = array( | |
92 | APP_CONFIG_PATH . '/config.php' => array( | |
93 | 'check_owner' => true, | |
94 | - 'owner' => 'apache', | |
95 | + 'owner' => 'root', | |
96 | 'check_group' => true, | |
97 | - 'group' => 'apache', | |
98 | + 'group' => 'http', | |
99 | 'check_permission' => true, | |
100 | 'permission' => 640, | |
101 | ), | |
102 | APP_CONFIG_PATH . '/setup.php' => array( | |
103 | 'check_owner' => true, | |
104 | - 'owner' => 'apache', | |
105 | + 'owner' => 'root', | |
106 | 'check_group' => true, | |
107 | - 'group' => 'apache', | |
108 | + 'group' => 'http', | |
109 | 'check_permission' => true, | |
110 | 'permission' => 660, | |
111 | 'check_filesize' => true, | |
73de38a1 ER |
112 | --- eventum-2.3.3/config/sphinx.conf.php~ 2012-06-27 14:59:39.000000000 +0300 |
113 | +++ eventum-2.3.3/config/sphinx.conf.php 2012-06-27 15:04:52.928810689 +0300 | |
114 | @@ -26,7 +26,7 @@ | |
115 | // | Authors: Bryan Alsdorf <bryan@mysql.com> | | |
116 | // | Authors: Elan Ruusamäe <glen@delfi.ee> | | |
117 | // +----------------------------------------------------------------------+ | |
858c6f2a ER |
118 | -require_once dirname(__FILE__) . "/../init.php"; |
119 | +require_once '/usr/share/eventum/init.php'; | |
120 | ||
121 | if (!defined('SPHINX_LOG_PATH')) { | |
122 | define('SPHINX_LOG_PATH', '/var/log/sphinx/'); | |
0b88d857 ER |
123 | --- eventum-3.0.0-285-g72865b8/autoload.php~ 2015-04-20 23:14:34.904789824 +0300 |
124 | +++ eventum-3.0.0-285-g72865b8/autoload.php 2015-04-20 23:22:44.240566443 +0300 | |
4b01e826 ER |
125 | @@ -54,11 +54,11 @@ |
126 | */ | |
cceed9a6 ER |
127 | |
128 | if (!defined('APP_PEAR_PATH')) { | |
4b01e826 | 129 | - define('APP_PEAR_PATH', ''); |
cceed9a6 ER |
130 | + define('APP_PEAR_PATH', '/usr/share/pear'); |
131 | } | |
132 | ||
0b88d857 ER |
133 | if (!defined('APP_PHP_PATH')) { |
134 | - define('APP_PHP_PATH', ''); | |
135 | + define('APP_PHP_PATH', '/usr/share/php'); | |
136 | } | |
137 | ||
138 | if (!defined('APP_FONTS_PATH')) { | |
139 | @@ -66,7 +66,7 @@ | |
140 | } | |
141 | ||
cceed9a6 | 142 | if (!defined('APP_SPHINXAPI_PATH')) { |
4b01e826 | 143 | - define('APP_SPHINXAPI_PATH', ''); |
0b88d857 | 144 | + define('APP_SPHINXAPI_PATH', APP_PHP_PATH); |
cceed9a6 ER |
145 | } |
146 | ||
147 | if (!defined('APP_PHP_GETTEXT_PATH')) { | |
0b88d857 | 148 | @@ -74,7 +74,7 @@ |
cceed9a6 ER |
149 | } |
150 | ||
151 | if (!defined('APP_SMARTY_PATH')) { | |
4b01e826 | 152 | - define('APP_SMARTY_PATH', ''); |
0b88d857 | 153 | + define('APP_SMARTY_PATH', APP_PHP_PATH . '/Smarty3'); |
cceed9a6 ER |
154 | } |
155 | ||
4b01e826 | 156 | // add PEAR to the include path, required by PEAR classes |