[packages/eventum.git] / eventum-paths.patch

--- eventum-3.0.3-118-g751b8cc/init.php~	2015-10-19 22:56:35.000000000 +0300
+++ eventum-3.0.3-118-g751b8cc/init.php	2015-10-19 23:00:17.390607216 +0300
@@ -72,10 +72,10 @@
 // define other paths
 $define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php');
 $define('APP_TPL_PATH', APP_PATH . '/templates');
-$define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
+$define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
 $define('APP_INC_PATH', APP_PATH . '/lib/eventum');
-$define('APP_LOCKS_PATH', APP_PATH . '/locks');
-$define('APP_LOG_PATH', APP_PATH . '/logs');
+$define('APP_LOCKS_PATH', APP_PATH . '/var/run/eventum');
+$define('APP_LOG_PATH', '/var/log/eventum');
 $define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
 $define('APP_CLI_LOG', APP_LOG_PATH . '/cli.log');
 $define('APP_IRC_LOG', APP_LOG_PATH . '/irc_bot.log');
--- 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('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', '/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', '/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/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-3.0.3-13-gfefa325/config/sphinx.conf.php~	2015-10-13 20:00:48.000000000 +0300
+++ eventum-3.0.3-13-gfefa325/config/sphinx.conf.php	2015-10-13 23:34:19.668134549 +0300
@@ -26,7 +26,7 @@
 // | Authors: Bryan Alsdorf <bryan@mysql.com>                             |
 // | Authors: Elan Ruusamäe <glen@delfi.ee>                               |
 // +----------------------------------------------------------------------+
-require_once __DIR__ . "/../init.php";
+require_once '/usr/share/eventum/init.php';
 
 if (!defined('SPHINX_LOG_PATH')) {
     define('SPHINX_LOG_PATH', '/var/log/sphinx/');
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 @@
899100ff ER	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)) {
31dabce6 ER	43	$errors[] = $error;
7a906e31 ER	44	--- eventum/bin/monitor.php 2010-11-24 17:24:23.000000000 +0200
7a906e31 ER	45	+++ eventum/bin/monitor.php 2010-11-24 18:23:09.664934996 +0200
97f6bb1b ER	46	@@ -37,17 +37,17 @@
	47	$required_files = array(
	48	APP_CONFIG_PATH . '/config.php' => array(
	49	'check_owner' => true,
	50	- 'owner' => 'apache',
	51	+ 'owner' => 'root',
	52	'check_group' => true,
	53	- 'group' => 'apache',
	54	+ 'group' => 'http',
	55	'check_permission' => true,
	56	'permission' => 640,
	57	),
	58	APP_CONFIG_PATH . '/setup.php' => array(
	59	'check_owner' => true,
	60	- 'owner' => 'apache',
	61	+ 'owner' => 'root',
	62	'check_group' => true,
	63	- 'group' => 'apache',
	64	+ 'group' => 'http',
	65	'check_permission' => true,
	66	'permission' => 660,
	67	'check_filesize' => true,
37f06e5c ER	68	--- eventum-3.0.3-13-gfefa325/config/sphinx.conf.php~ 2015-10-13 20:00:48.000000000 +0300
37f06e5c ER	69	+++ eventum-3.0.3-13-gfefa325/config/sphinx.conf.php 2015-10-13 23:34:19.668134549 +0300
73de38a1 ER	70	@@ -26,7 +26,7 @@
	71	// \| Authors: Bryan Alsdorf <bryan@mysql.com> \|
	72	// \| Authors: Elan Ruusamäe <glen@delfi.ee> \|
	73	// +----------------------------------------------------------------------+
37f06e5c	74	-require_once __DIR__ . "/../init.php";
858c6f2a ER	75	+require_once '/usr/share/eventum/init.php';
	76
	77	if (!defined('SPHINX_LOG_PATH')) {
	78	define('SPHINX_LOG_PATH', '/var/log/sphinx/');