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