X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eventum-paths.patch;h=fbe163d28b6015cd450fafacda68063949bb0388;hb=371b276ab631c8d0f88f9387e6f31dffa7ad386a;hp=956a7eaedb811c2298d8372b67fcb88c32612f82;hpb=b59a718ef863a575f64070a216c2f66ea9bdca9d;p=packages%2Feventum.git diff --git a/eventum-paths.patch b/eventum-paths.patch index 956a7ea..fbe163d 100644 --- a/eventum-paths.patch +++ b/eventum-paths.patch @@ -1,167 +1,72 @@ ---- eventum-3.0.0/init.php~ 2015-02-02 20:02:01.825332859 +0200 -+++ eventum-3.0.0/init.php 2015-02-02 20:03:12.610911011 +0200 -@@ -27,7 +27,7 @@ - // | Authors: Elan Ruusamäe | - // +----------------------------------------------------------------------+ +--- eventum-3.3.4-365-g65c5538f/globals.php~ 2018-03-13 10:49:12.000000000 +0200 ++++ eventum-3.3.4-365-g65c5538f/globals.php 2018-03-13 23:22:58.153814696 +0200 +@@ -22,7 +22,7 @@ --if (!file_exists(dirname(__FILE__) . '/config/config.php') || !filesize(dirname(__FILE__) . '/config/config.php')) { -+if (!file_exists('/etc/webapps/eventum/config.php') || !filesize('/etc/webapps/eventum/config.php')) { - Header('Location: setup/'); - exit(0); - } -@@ -47,7 +47,7 @@ - // define base path - define('APP_PATH', realpath(dirname(__FILE__))); - if (!defined('APP_CONFIG_PATH')) { -- define('APP_CONFIG_PATH', APP_PATH . '/config'); -+ define('APP_CONFIG_PATH', '/etc/webapps/eventum'); - } - - // include local site config. may override any default ---- eventum-3.0.0/init.php~ 2015-02-02 20:02:01.825332859 +0200 -+++ eventum-3.0.0/init.php 2015-02-02 20:03:12.610911011 +0200 -@@ -78,7 +78,7 @@ - } - - if (!defined('APP_TPL_COMPILE_PATH')) { -- define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c'); -+ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum'); - } - - if (!defined('APP_INC_PATH')) { -@@ -81,7 +77,7 @@ - } - - if (!defined('APP_LOCKS_PATH')) { -- define('APP_LOCKS_PATH', APP_PATH . '/locks'); -+ define('APP_LOCKS_PATH', '/var/run/eventum/'); - } - - if (!defined('APP_SQL_PATCHES_PATH')) { -@@ -89,7 +85,7 @@ - } - - if (!defined('APP_LOG_PATH')) { -- define('APP_LOG_PATH', APP_PATH . '/logs'); -+ define('APP_LOG_PATH', '/var/log/eventum'); - } - - if (!defined('APP_ROUTED_MAILS_SAVEDIR')) { ---- eventum-3.0.0/htdocs/setup/index.php~ 2015-02-02 20:03:49.507010317 +0200 -+++ eventum-3.0.0/htdocs/setup/index.php 2015-02-02 20:05:00.139257552 +0200 -@@ -44,10 +44,10 @@ - define('APP_CONFIG_PATH', APP_PATH . '/config'); - define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php'); + // define other paths define('APP_TPL_PATH', APP_PATH . '/templates'); --define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c'); --define('APP_LOG_PATH', APP_PATH . '/logs'); +-define('APP_TPL_COMPILE_PATH', APP_VAR_PATH . '/cache'); +-define('APP_LOG_PATH', APP_VAR_PATH . '/log'); +define('APP_TPL_COMPILE_PATH', '/var/cache/eventum'); +define('APP_LOG_PATH', '/var/log/eventum'); define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log'); --define('APP_LOCKS_PATH', APP_PATH . '/locks'); +-define('APP_LOCKS_PATH', APP_VAR_PATH . '/lock'); +define('APP_LOCKS_PATH', '/var/run/eventum'); - define('APP_LOCAL_PATH', APP_CONFIG_PATH); - - header('Content-Type: text/html; charset=' . APP_CHARSET); -@@ -254,10 +254,6 @@ - $errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly."; - } - -- $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", true); -- if (!empty($error)) { -- $errors[] = $error; -- } - $error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'"); - if (!empty($error)) { - $errors[] = $error; ---- eventum-2.2/irc/eventum-irc-bot.php~ 2009-07-23 14:03:41.422211655 +0300 -+++ eventum-2.2/irc/eventum-irc-bot.php 2009-07-23 13:54:22.000000000 +0300 -@@ -32,7 +32,7 @@ - - ini_set('memory_limit', '1024M'); - --require_once dirname(__FILE__) . '/../init.php'; -+require_once '/usr/share/eventum/init.php'; - - if (!file_exists(APP_CONFIG_PATH . '/irc_config.php')) { - fwrite(STDERR, "ERROR: No config specified. Please see setup/irc_config.php for config information.\n\n"); ---- eventum/bin/monitor.php 2010-11-24 17:24:23.000000000 +0200 -+++ eventum/bin/monitor.php 2010-11-24 18:23:09.664934996 +0200 -@@ -37,17 +37,17 @@ - $required_files = array( - APP_CONFIG_PATH . '/config.php' => array( - 'check_owner' => true, -- 'owner' => 'apache', -+ 'owner' => 'root', - 'check_group' => true, -- 'group' => 'apache', -+ 'group' => 'http', - 'check_permission' => true, - 'permission' => 640, - ), - APP_CONFIG_PATH . '/setup.php' => array( - 'check_owner' => true, -- 'owner' => 'apache', -+ 'owner' => 'root', - 'check_group' => true, -- 'group' => 'apache', -+ 'group' => 'http', - 'check_permission' => true, - 'permission' => 660, - 'check_filesize' => true, ---- eventum-2.3.3/config/sphinx.conf.php~ 2012-06-27 14:59:39.000000000 +0300 -+++ eventum-2.3.3/config/sphinx.conf.php 2012-06-27 15:04:52.928810689 +0300 -@@ -26,7 +26,7 @@ - // | Authors: Bryan Alsdorf | - // | Authors: Elan Ruusamäe | - // +----------------------------------------------------------------------+ --require_once dirname(__FILE__) . "/../init.php"; +--- eventum-3.1.10-340-gfc2f2394/src/Controller/Setup/SetupController.php~ 2017-05-04 23:47:50.000000000 +0300 ++++ eventum-3.1.10-340-gfc2f2394/src/Controller/Setup/SetupController.php 2017-05-17 19:55:50.362400076 +0300 +@@ -201,10 +201,6 @@ + = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly."; + } + +- $error = $this->checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", true); +- if (!empty($error)) { +- $errors[] = $error; +- } + $error = $this->checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE . "'"); + if (!empty($error)) { + $errors[] = $error; +--- eventum-3.0.8-100-g3543f89/src/Console/Command/MonitorCommand.php~ 2016-01-31 18:24:19.000000000 +0200 ++++ eventum-3.0.8-100-g3543f89/src/Console/Command/MonitorCommand.php 2016-02-01 00:16:28.751423105 +0200 +@@ -31,17 +31,17 @@ + $required_files = array( + APP_CONFIG_PATH . '/config.php' => [ + 'check_owner' => true, +- 'owner' => 'apache', ++ 'owner' => 'root', + 'check_group' => true, +- 'group' => 'apache', ++ 'group' => 'http', + 'check_permission' => true, + 'permission' => 640, + ], + APP_CONFIG_PATH . '/setup.php' => [ + 'check_owner' => true, +- 'owner' => 'apache', ++ 'owner' => 'root', + 'check_group' => true, +- 'group' => 'apache', ++ 'group' => 'http', + 'check_permission' => true, + 'permission' => 660, + 'check_filesize' => true, +--- eventum-3.1.5/config/sphinx.conf.php~ 2016-11-13 12:05:37.000000000 +0200 ++++ eventum-3.1.5/config/sphinx.conf.php 2016-11-23 03:10:05.855040510 +0200 +@@ -1,7 +1,7 @@ + #!/usr/bin/php +