Merge branch 'dev-3.5.0'
[packages/eventum.git] / eventum-paths.patch
CommitLineData
36395687
ER
1--- eventum-3.3.4-365-g65c5538f/globals.php~ 2018-03-13 10:49:12.000000000 +0200
2+++ eventum-3.3.4-365-g65c5538f/globals.php 2018-03-13 23:22:58.153814696 +0200
3@@ -22,7 +22,7 @@
1beb4932
ER
4
5 // define other paths
6 define('APP_TPL_PATH', APP_PATH . '/templates');
7-define('APP_TPL_COMPILE_PATH', APP_VAR_PATH . '/cache');
1beb4932
ER
8-define('APP_LOG_PATH', APP_VAR_PATH . '/log');
9+define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
1beb4932
ER
10+define('APP_LOG_PATH', '/var/log/eventum');
11 define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
36395687
ER
12-define('APP_LOCKS_PATH', APP_VAR_PATH . '/lock');
13+define('APP_LOCKS_PATH', '/var/run/eventum');
290540fe
ER
14--- eventum-3.5.0/src/Controller/Setup/SetupController.php~ 2018-05-20 17:33:34.000000000 +0300
15+++ eventum-3.5.0/src/Controller/Setup/SetupController.php 2018-05-21 01:40:24.095066355 +0300
16@@ -210,10 +210,6 @@
17 $configPath = Setup::getConfigPath();
18 $setupFile = Setup::getSetupFile();
abac5638 19
290540fe 20- $error = $this->checkPermissions($configPath, "Directory '" . $configPath . "'", true);
1beb4932
ER
21- if (!empty($error)) {
22- $errors[] = $error;
23- }
290540fe 24 $error = $this->checkPermissions($setupFile, "File '" . $setupFile . "'");
1beb4932
ER
25 if (!empty($error)) {
26 $errors[] = $error;
290540fe
ER
27--- eventum-3.5.0/src/Console/Command/MonitorCommand.php~ 2018-05-20 17:33:34.000000000 +0300
28+++ eventum-3.5.0/src/Console/Command/MonitorCommand.php 2018-05-21 01:42:21.463354763 +0300
29@@ -47,17 +47,17 @@
30 $required_files = [
31 $configPath . '/config.php' => [
549721ab
ER
32 'check_owner' => true,
33- 'owner' => 'apache',
34+ 'owner' => 'root',
35 'check_group' => true,
36- 'group' => 'apache',
37+ 'group' => 'http',
38 'check_permission' => true,
39 'permission' => 640,
a8005c48 40 ],
290540fe 41 $configPath . '/setup.php' => [
549721ab
ER
42 'check_owner' => true,
43- 'owner' => 'apache',
44+ 'owner' => 'root',
45 'check_group' => true,
46- 'group' => 'apache',
47+ 'group' => 'http',
48 'check_permission' => true,
49 'permission' => 660,
50 'check_filesize' => true,
cb60690e
ER
51--- eventum-3.1.5/config/sphinx.conf.php~ 2016-11-13 12:05:37.000000000 +0200
52+++ eventum-3.1.5/config/sphinx.conf.php 2016-11-23 03:10:05.855040510 +0200
9d207070
ER
53@@ -1,7 +1,7 @@
54 #!/usr/bin/php
55 <?php
56
cb60690e 57-require_once __DIR__ . '/../init.php';
858c6f2a
ER
58+require_once '/usr/share/eventum/init.php';
59
60 if (!defined('SPHINX_LOG_PATH')) {
61 define('SPHINX_LOG_PATH', '/var/log/sphinx/');
9dd475ab
ER
62--- eventum-3.3.1/src/Attachment/StorageManager.php~ 2017-10-08 15:53:56.000000000 +0300
63+++ eventum-3.3.1/src/Attachment/StorageManager.php 2017-10-09 23:22:00.162142738 +0300
64@@ -32,7 +32,7 @@
65 *
66 * @var string
67 */
68- const STORAGE_PATH = APP_PATH . '/var/storage/';
69+ const STORAGE_PATH = '/var/lib/eventum/storage/';
ac6bab4c 70
9dd475ab
ER
71 /**
72 * @var MountManager
This page took 0.475043 seconds and 4 git commands to generate.