]> git.pld-linux.org Git - packages/eventum.git/blobdiff - eventum-paths.patch
Up to 3.10.12
[packages/eventum.git] / eventum-paths.patch
index 472fd4adafe13031aa273269781aa009ebe55001..aad990328ce2451253009864419122d7d4163c49 100644 (file)
@@ -1,77 +1,75 @@
---- eventum-3.1.10-340-gfc2f2394/globals.php~  2017-05-16 18:18:37.000000000 +0300
-+++ eventum-3.1.10-340-gfc2f2394/globals.php   2017-05-17 19:54:53.436574941 +0300
-@@ -25,7 +25,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_LOCKS_PATH', APP_VAR_PATH . '/lock');
--define('APP_LOG_PATH', APP_VAR_PATH . '/log');
-+define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
-+define('APP_LOCKS_PATH', '/var/run/eventum');
-+define('APP_LOG_PATH', '/var/log/eventum');
- define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
---- eventum-3.0.3-287-ge48a790/htdocs/setup/index.php~ 2015-10-26 21:45:35.367554219 +0200
-+++ eventum-3.0.3-287-ge48a790/htdocs/setup/index.php  2015-10-26 21:47:31.775849576 +0200
-@@ -47,10 +47,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_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');
- define('APP_LOCAL_PATH', APP_CONFIG_PATH);
+-    // "/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';
  
- header('Content-Type: text/html; charset=' . APP_CHARSET);
---- eventum-3.1.10-340-gfc2f2394/src/Controller/Setup/SetupController.php~     2017-05-04 23:47:50.000000000 +0300
-+++ eventum-3.1.10-340-gfc2f2394/src/Controller/Setup/SetupController.php      2017-05-17 19:55:50.362400076 +0300
-@@ -201,10 +201,6 @@
-                 = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
-         }
+     // 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';
  
--        $error = $this->checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", true);
+     // 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);
 -        if (!empty($error)) {
 -            $errors[] = $error;
 -        }
-         $error = $this->checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE . "'");
+         $error = $this->checkPermissions($setupFile, "File '" . $setupFile . "'");
          if (!empty($error)) {
              $errors[] = $error;
---- eventum-3.0.8-100-g3543f89/src/Command/MonitorCommand.php~ 2016-01-31 18:24:19.000000000 +0200
-+++ eventum-3.0.8-100-g3543f89/src/Command/MonitorCommand.php  2016-02-01 00:16:28.751423105 +0200
-@@ -31,17 +31,17 @@
-         $required_files = array(
-             APP_CONFIG_PATH . '/config.php' => [
-                 'check_owner' => true,
--                'owner' => 'apache',
-+                'owner' => 'root',
-                 'check_group' => true,
--                'group' => 'apache',
-+                'group' => 'http',
-                 'check_permission' => true,
-                 'permission' => 640,
-             ],
-             APP_CONFIG_PATH . '/setup.php' => [
+--- 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 . '/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/');
+ /** @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
+      */
+-    private const STORAGE_PATH = Paths::APP_PATH . '/var/storage/';
++    private const STORAGE_PATH = '/var/lib/eventum/storage/';
+     /**
+      * @var MountManager
This page took 0.039918 seconds and 4 git commands to generate.