X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eventum-paths.patch;h=8384539acd786ec1e444ad97423ae677cc9eaf58;hb=2a8699709f6a489d0d37f1729182b85314eceaa0;hp=5b8290e1f2024727d52bb5c8b609ac0c033032a5;hpb=549721ab9d117be3bb9d0e4480ee0e8bbe808cb2;p=packages%2Feventum.git

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 5b8290e..8384539 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,50 +1,37 @@
---- eventum-3.0.3-287-ge48a790/init.php~	2015-10-26 21:42:14.000000000 +0200
-+++ eventum-3.0.3-287-ge48a790/init.php	2015-10-26 21:46:47.983157509 +0200
-@@ -76,9 +76,9 @@
- $define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php');
- $define('APP_INC_PATH', APP_PATH . '/lib/eventum');
- $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');
- $define('APP_CLI_LOG', APP_LOG_PATH . '/cli.log');
- $define('APP_IRC_LOG', APP_LOG_PATH . '/irc_bot.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');
+--- 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');
+ 
+ // define other paths
  define('APP_TPL_PATH', APP_PATH . '/templates');
--define('APP_TPL_COMPILE_PATH', APP_VAR_PATH . '/cache');
+ define('APP_TPL_COMPILE_PATH', APP_CACHE_PATH . '/smarty');
 -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);
- 
- header('Content-Type: text/html; charset=' . APP_CHARSET);
-@@ -254,10 +254,6 @@
-         $errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
-     }
+--- 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 = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", true);
--    if (!empty($error)) {
--        $errors[] = $error;
--    }
-     $error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'");
-     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' => array(
+-        $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',
@@ -53,8 +40,8 @@
 +                'group' => 'http',
                  'check_permission' => true,
                  'permission' => 640,
-             ),
-             APP_CONFIG_PATH . '/setup.php' => array(
+             ],
+             $configPath . '/setup.php' => [
                  'check_owner' => true,
 -                'owner' => 'apache',
 +                'owner' => 'root',
@@ -64,14 +51,41 @@
                  'check_permission' => true,
                  'permission' => 660,
                  'check_filesize' => true,
---- eventum-3.0.3-314-gedea8e4/config/sphinx.conf.php~	2015-10-27 18:02:36.000000000 +0200
-+++ eventum-3.0.3-314-gedea8e4/config/sphinx.conf.php	2015-10-29 11:53:26.068169385 +0200
+--- 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 __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.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;
+     }
+ }