X-Git-Url: http://git.pld-linux.org/?p=packages%2Feventum.git;a=blobdiff_plain;f=eventum-paths.patch;h=fc897ac637636a23e07caba9f5149d9481a0f356;hp=7f3b3d8536b6d5c9b943b3bdc0acb93123db749f;hb=HEAD;hpb=79c99ac702a5d3200cf9c1b0b0234277b472d707;ds=sidebyside

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 7f3b3d8..aad9903 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,20 +1,33 @@
---- 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 @@
+--- eventum-3.10.1/src/Config/Paths.php~	2020-12-02 23:16:35.000000000 +0200
++++ eventum-3.10.1/src/Config/Paths.php	2021-03-24 21:56:18.672527936 +0200
+@@ -22,18 +22,16 @@
+     public const APP_PUBLIC_PATH = APP_PATH . '/htdocs';
+     public const APP_INC_PATH = APP_PATH . '/lib/eventum';
  
- // 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.0/src/Controller/Setup/SetupController.php~	2018-05-20 17:33:34.000000000 +0300
-+++ eventum-3.5.0/src/Controller/Setup/SetupController.php	2018-05-21 01:40:24.095066355 +0300
-@@ -210,10 +210,6 @@
-         $configPath = Setup::getConfigPath();
+-    // "/var" path for writable data
+-    private const APP_VAR_PATH = APP_PATH . '/var';
+-    public const APP_SPOOL_PATH = self::APP_VAR_PATH . '/spool';
+-    public const APP_CACHE_PATH = self::APP_VAR_PATH . '/cache';
++    public const APP_SPOOL_PATH = '/var/spool/eventum';
++    public const APP_CACHE_PATH = '/var/cache/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_LOCKS_PATH = self::APP_VAR_PATH . '/lock';
++    public const APP_LOG_PATH = '/var/log/eventum';
++    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';
+     public const APP_HELP_PATH = APP_PATH . '/docs/help';
+ }
+--- eventum-3.9.11.org/src/Setup/Requirements.php	2020-08-01 20:21:08.000000000 +0200
++++ eventum-3.9.11/src/Setup/Requirements.php	2021-03-10 15:18:12.361997906 +0100
+@@ -69,10 +69,6 @@ class Requirements
+         $privateKeyPath = Setup::getPrivateKeyPath();
          $setupFile = Setup::getSetupFile();
  
 -        $error = $this->checkPermissions($configPath, "Directory '" . $configPath . "'", true);
@@ -24,49 +37,39 @@
          $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 @@
+--- eventum-3.9.0/src/Console/Command/MonitorCommand.php~	2019-10-21 22:17:43.000000000 +0300
++++ eventum-3.9.0/src/Console/Command/MonitorCommand.php	2020-07-02 00:40:16.042698823 +0300
+@@ -68,9 +68,9 @@
          $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',
++                'owner' => 'http',
                  '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
+--- eventum-3.9.11.org/config/sphinx.conf.php	2020-05-05 08:20:33.000000000 +0200
++++ eventum-3.9.11/config/sphinx.conf.php	2021-03-10 15:18:12.361997906 +0100
+@@ -4,7 +4,7 @@
+ use Eventum\Config\SphinxConfig;
+ use Eventum\ServiceContainer;
  
 -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 SphinxConfig $config */
+ $config = ServiceContainer::get(SphinxConfig::class);
+--- 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