Merge branch 'dev-3.8.0'

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

diff --git a/eventum-paths.patch b/eventum-paths.patch
index f4deebd67ec4713bcd4df02d5cbded151b1908c1..f117c1c560cb7e10c874c608768c26a1deabccb6 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,19 +1,24 @@
---- eventum-3.6.7-73-ga12094613/globals.php    2019-05-17 00:29:37.284776088 +0300
-+++ eventum-3.6.7-73-ga12094613/globals.php    2019-05-17 00:30:55.133655597 +0300
-@@ -22,10 +22,8 @@
--// /var path for writable data
--define('APP_VAR_PATH', APP_PATH . '/var');
--define('APP_CACHE_PATH', APP_VAR_PATH . '/cache');
-+define('APP_CACHE_PATH', '/var/cache/eventum');
+--- eventum-3.7.4-440-gcc5ad3db5/src/Config/Paths.php  2019-08-21 23:32:40.826463576 +0300
++++ eventum-3.7.4-440-gcc5ad3db5/src/Config/Paths.php  2019-08-21 23:38:04.548486455 +0300
+@@ -24,14 +24,13 @@
+     // "/var" path for writable data
+-    public const APP_VAR_PATH = APP_PATH . '/var';
+-    public const APP_CACHE_PATH = self::APP_VAR_PATH . '/cache';
++    public const APP_CACHE_PATH = '/var/cache/eventum';
  
- // define other paths
- define('APP_TPL_PATH', APP_PATH . '/templates');
- define('APP_TPL_COMPILE_PATH', APP_CACHE_PATH . '/smarty');
--define('APP_LOG_PATH', APP_VAR_PATH . '/log');
-+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');
+     // define other paths
+     public const APP_TPL_PATH = APP_PATH . '/templates';
+     public const APP_TPL_COMPILE_PATH = self::APP_CACHE_PATH . '/smarty';
+-    public const APP_LOG_PATH = self::APP_VAR_PATH . '/log';
++    public const APP_LOG_PATH = '/var/log/eventum';
+     public const APP_ERROR_LOG = self::APP_LOG_PATH . '/errors.log';
+-    public const APP_LOCKS_PATH = self::APP_VAR_PATH . '/lock';
++    public const APP_LOCKS_PATH = '/var/run/eventum';
+ 
+     // fonts directory for phplot
+-    public const APP_FONTS_PATH = APP_PATH . '/vendor/fonts/liberation';
++    public const APP_FONTS_PATH = '/usr/share/fonts/TTF';
+ }
 --- 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 @@
@@ -62,33 +67,17 @@
  
  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 @@
+--- eventum-3.7.4-440-gcc5ad3db5/src/Attachment/StorageManager.php~    2019-08-11 22:49:07.000000000 +0300
++++ eventum-3.7.4-440-gcc5ad3db5/src/Attachment/StorageManager.php     2019-08-21 23:33:19.325911295 +0300
+@@ -33,7 +33,7 @@
       *
       * @var string
       */
--    const STORAGE_PATH = APP_PATH . '/var/storage/';
-+    const STORAGE_PATH = '/var/lib/eventum/storage/';
+-    private const STORAGE_PATH = Paths::APP_PATH . '/var/storage/';
++    private const STORAGE_PATH = '/var/lib/eventum/storage/';
  
      /**
       * @var MountManager
---- eventum-3.7.1/src/Kernel.php~      2019-04-06 17:42:28.000000000 +0300
-+++ eventum-3.7.1/src/Kernel.php       2019-06-02 23:02:32.198743341 +0300
-@@ -87,11 +87,11 @@
- 
-     public function getCacheDir(): string
-     {
--        return "{$this->rootDir}/var/cache/{$this->environment}";
-+        return APP_CACHE_PATH . '/' . $this->environment;
-     }
- 
-     public function getLogDir(): string
-     {
--        return "{$this->rootDir}/var/log";
-+        return APP_LOG_PATH;
-     }
- }
 --- eventum/config/services.yml~       2019-08-02 01:33:18.681001511 +0300
 +++ eventum/config/services.yml        2019-08-02 01:33:20.290978222 +0300
 @@ -15,13 +15,13 @@