run upgrade script as http user; keep config dir writable

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

diff --git a/eventum-paths.patch b/eventum-paths.patch
index bf3d6fe656d8b3a5054fb471428a0563d43f70e5..fbe163d28b6015cd450fafacda68063949bb0388 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,23 +1,8 @@
---- 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.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');
@@ -26,22 +11,21 @@
  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.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.";
+         }
  
--    $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
+-        $error = $this->checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", true);
+-        if (!empty($error)) {
+-            $errors[] = $error;
+-        }
+         $error = $this->checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE . "'");
+         if (!empty($error)) {
+             $errors[] = $error;
+--- eventum-3.0.8-100-g3543f89/src/Console/Command/MonitorCommand.php~ 2016-01-31 18:24:19.000000000 +0200
++++ eventum-3.0.8-100-g3543f89/src/Console/Command/MonitorCommand.php  2016-02-01 00:16:28.751423105 +0200
 @@ -31,17 +31,17 @@
          $required_files = array(
              APP_CONFIG_PATH . '/config.php' => [
@@ -64,14 +48,25 @@
                  '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