Merge branch 'dev-3.6.5'

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

--- 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 @@
 
 // define other paths
 define('APP_TPL_PATH', APP_PATH . '/templates');
-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_VAR_PATH . '/lock');
+define('APP_LOCKS_PATH', '/var/run/eventum');
--- eventum-3.5.6-98-g5b87d2b0/src/Setup/Requirements.php~	2019-01-23 01:50:42.000000000 +0200
+++ eventum-3.5.6-98-g5b87d2b0/src/Setup/Requirements.php	2019-01-24 22:18:56.047816296 +0200
@@ -64,10 +64,6 @@
         $configPath = Setup::getConfigPath();
         $setupFile = Setup::getSetupFile();
 
-        $error = $this->checkPermissions($configPath, "Directory '" . $configPath . "'", true);
-        if (!empty($error)) {
-            $errors[] = $error;
-        }
         $error = $this->checkPermissions($setupFile, "File '" . $setupFile . "'");
         if (!empty($error)) {
             $errors[] = $error;
--- eventum-3.5.0/src/Console/Command/MonitorCommand.php~	2018-05-20 17:33:34.000000000 +0300
+++ eventum-3.5.0/src/Console/Command/MonitorCommand.php	2018-05-21 01:42:21.463354763 +0300
@@ -47,17 +47,17 @@
         $required_files = [
             $configPath . '/config.php' => [
                 'check_owner' => true,
-                'owner' => 'apache',
+                'owner' => 'root',
                 'check_group' => true,
-                'group' => 'apache',
+                'group' => 'http',
                 'check_permission' => true,
                 'permission' => 640,
             ],
             $configPath . '/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
 <?php
 
-require_once __DIR__ . '/../init.php';
+require_once '/usr/share/eventum/init.php';
 
 if (!defined('SPHINX_LOG_PATH')) {
     define('SPHINX_LOG_PATH', '/var/log/sphinx/');
--- eventum-3.3.1/src/Attachment/StorageManager.php~	2017-10-08 15:53:56.000000000 +0300
+++ eventum-3.3.1/src/Attachment/StorageManager.php	2017-10-09 23:22:00.162142738 +0300
@@ -32,7 +32,7 @@
      *
      * @var string
      */
-    const STORAGE_PATH = APP_PATH . '/var/storage/';
+    const STORAGE_PATH = '/var/lib/eventum/storage/';
 
     /**
      * @var MountManager
--- eventum-3.6.5/src/Db/Doctrine.php~	2019-03-23 21:53:29.000000000 +0200
+++ eventum-3.6.5/src/Db/Doctrine.php	2019-04-08 13:08:37.751679436 +0300
@@ -64,7 +64,7 @@
         ];
 
         $cacheDriver = new Cache\ArrayCache();
-        $proxyDir = APP_VAR_PATH . '/cache/doctrine/proxies';
+        $proxyDir = '/var/cache/eventum/doctrine/proxies';
 
         $config = Setup::createAnnotationMetadataConfiguration($paths, $isDevMode, $proxyDir, $cache = null, $useSimpleAnnotationReader = false);