]>
Commit | Line | Data |
---|---|---|
b01e96c4 ER |
1 | --- eventum-3.0.3-118-g751b8cc/init.php~ 2015-10-19 22:56:35.000000000 +0300 |
2 | +++ eventum-3.0.3-118-g751b8cc/init.php 2015-10-19 23:00:17.390607216 +0300 | |
3 | @@ -72,10 +72,10 @@ | |
4 | // define other paths | |
5 | $define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php'); | |
6 | $define('APP_TPL_PATH', APP_PATH . '/templates'); | |
7 | -$define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c'); | |
8 | +$define('APP_TPL_COMPILE_PATH', '/var/cache/eventum'); | |
9 | $define('APP_INC_PATH', APP_PATH . '/lib/eventum'); | |
10 | -$define('APP_LOCKS_PATH', APP_PATH . '/locks'); | |
11 | -$define('APP_LOG_PATH', APP_PATH . '/logs'); | |
12 | +$define('APP_LOCKS_PATH', APP_PATH . '/var/run/eventum'); | |
13 | +$define('APP_LOG_PATH', '/var/log/eventum'); | |
14 | $define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log'); | |
15 | $define('APP_CLI_LOG', APP_LOG_PATH . '/cli.log'); | |
16 | $define('APP_IRC_LOG', APP_LOG_PATH . '/irc_bot.log'); | |
7a906e31 ER |
17 | --- eventum-3.0.0/htdocs/setup/index.php~ 2015-02-02 20:03:49.507010317 +0200 |
18 | +++ eventum-3.0.0/htdocs/setup/index.php 2015-02-02 20:05:00.139257552 +0200 | |
19 | @@ -44,10 +44,10 @@ | |
20 | define('APP_CONFIG_PATH', APP_PATH . '/config'); | |
ae3e48e6 ER |
21 | define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php'); |
22 | define('APP_TPL_PATH', APP_PATH . '/templates'); | |
23 | -define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c'); | |
24 | -define('APP_LOG_PATH', APP_PATH . '/logs'); | |
31dabce6 | 25 | +define('APP_TPL_COMPILE_PATH', '/var/cache/eventum'); |
ae3e48e6 ER |
26 | +define('APP_LOG_PATH', '/var/log/eventum'); |
27 | define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log'); | |
28 | -define('APP_LOCKS_PATH', APP_PATH . '/locks'); | |
29 | +define('APP_LOCKS_PATH', '/var/run/eventum'); | |
7a906e31 | 30 | define('APP_LOCAL_PATH', APP_CONFIG_PATH); |
31dabce6 | 31 | |
ae3e48e6 | 32 | header('Content-Type: text/html; charset=' . APP_CHARSET); |
899100ff ER |
33 | @@ -254,10 +254,6 @@ |
34 | $errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly."; | |
452347b6 | 35 | } |
abac5638 | 36 | |
899100ff | 37 | - $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", true); |
31dabce6 ER |
38 | - if (!empty($error)) { |
39 | - $errors[] = $error; | |
40 | - } | |
098cbb72 | 41 | $error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'"); |
31dabce6 ER |
42 | if (!empty($error)) { |
43 | $errors[] = $error; | |
37f06e5c ER |
44 | --- eventum-3.0.3-13-gfefa325/irc/eventum-irc-bot.php~ 2015-10-13 20:00:48.000000000 +0300 |
45 | +++ eventum-3.0.3-13-gfefa325/irc/eventum-irc-bot.php 2015-10-13 23:33:33.408818382 +0300 | |
46 | @@ -31,7 +31,7 @@ | |
b33d41f0 ER |
47 | |
48 | ini_set('memory_limit', '1024M'); | |
49 | ||
37f06e5c | 50 | -require_once __DIR__ . '/../init.php'; |
b33d41f0 ER |
51 | +require_once '/usr/share/eventum/init.php'; |
52 | ||
53 | if (!file_exists(APP_CONFIG_PATH . '/irc_config.php')) { | |
54 | fwrite(STDERR, "ERROR: No config specified. Please see setup/irc_config.php for config information.\n\n"); | |
7a906e31 ER |
55 | --- eventum/bin/monitor.php 2010-11-24 17:24:23.000000000 +0200 |
56 | +++ eventum/bin/monitor.php 2010-11-24 18:23:09.664934996 +0200 | |
97f6bb1b ER |
57 | @@ -37,17 +37,17 @@ |
58 | $required_files = array( | |
59 | APP_CONFIG_PATH . '/config.php' => array( | |
60 | 'check_owner' => true, | |
61 | - 'owner' => 'apache', | |
62 | + 'owner' => 'root', | |
63 | 'check_group' => true, | |
64 | - 'group' => 'apache', | |
65 | + 'group' => 'http', | |
66 | 'check_permission' => true, | |
67 | 'permission' => 640, | |
68 | ), | |
69 | APP_CONFIG_PATH . '/setup.php' => array( | |
70 | 'check_owner' => true, | |
71 | - 'owner' => 'apache', | |
72 | + 'owner' => 'root', | |
73 | 'check_group' => true, | |
74 | - 'group' => 'apache', | |
75 | + 'group' => 'http', | |
76 | 'check_permission' => true, | |
77 | 'permission' => 660, | |
78 | 'check_filesize' => true, | |
37f06e5c ER |
79 | --- eventum-3.0.3-13-gfefa325/config/sphinx.conf.php~ 2015-10-13 20:00:48.000000000 +0300 |
80 | +++ eventum-3.0.3-13-gfefa325/config/sphinx.conf.php 2015-10-13 23:34:19.668134549 +0300 | |
73de38a1 ER |
81 | @@ -26,7 +26,7 @@ |
82 | // | Authors: Bryan Alsdorf <bryan@mysql.com> | | |
83 | // | Authors: Elan Ruusamäe <glen@delfi.ee> | | |
84 | // +----------------------------------------------------------------------+ | |
37f06e5c | 85 | -require_once __DIR__ . "/../init.php"; |
858c6f2a ER |
86 | +require_once '/usr/share/eventum/init.php'; |
87 | ||
88 | if (!defined('SPHINX_LOG_PATH')) { | |
89 | define('SPHINX_LOG_PATH', '/var/log/sphinx/'); |