- webapps paths

Changed files:
    eventum-cvs-config.patch -> 1.3
    eventum-irc-config.patch -> 1.10
    eventum-paths.patch -> 1.27

diff --git a/eventum-cvs-config.patch b/eventum-cvs-config.patch
index 253174d810664ed7bd1b4b82e99b4998c9a3d251..ffb5a01bad94b2c721053123156ec0bac8165ce7 100644 (file)
--- a/eventum-cvs-config.patch
+++ b/eventum-cvs-config.patch
@@ -8,7 +8,7 @@
 -$eventum_relative_url = '/';
 -$eventum_port = 80;
  
-+include '/etc/eventum/cvs.php';
++include '/etc/webapps/eventum/cvs.php';
  
  //
  // DO NOT CHANGE ANYTHING AFTER THIS LINE

diff --git a/eventum-irc-config.patch b/eventum-irc-config.patch
index 3ac7e371c4d260456e49fbb74f198ad1ab5b949f..91fda6d632cd6174136c50e1f31c73e41ced76c1 100644 (file)
--- a/eventum-irc-config.patch
+++ b/eventum-irc-config.patch
@@ -4,8 +4,8 @@
  //
  // @(#) $Id$
  //
-+require_once('/etc/eventum/core.php');
-+include_once('/etc/eventum/irc.php');
++require_once('/etc/webapps/eventum/core.php');
++include_once('/etc/webapps/eventum/irc.php');
  
 -include_once("../../config.inc.php");
  include_once(APP_INC_PATH . "db_access.php");

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 9ff09efe68de272aad9d939a2ea3c260a7cbdd02..43d0e002b9cb425a6bfe07cc5c4703646eabad99 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -5,7 +5,7 @@
  // @(#) $Id$
  //
 -include_once("config.inc.php");
-+include_once("/etc/eventum/cli.php");
++include_once("/etc/webapps/eventum/cli.php");
  include_once(APP_INC_PATH . "class.command_line.php");
  include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
  
@@ -60,7 +60,7 @@
 +++ ./misc/cli/eventum 2005-01-25 15:48:56.000000000 +0200
 @@ -13,7 +13,7 @@
  //
- include_once("/etc/eventum/cli.php");
+ include_once("/etc/webapps/eventum/cli.php");
  include_once(APP_INC_PATH . "class.command_line.php");
 -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
 +include_once(APP_PEAR_PATH . "XML/RPC.php");
@@ -121,7 +121,7 @@
          $errors[] = $error;
      }
 -    $error = checkPermissions('../config.inc.php', "File 'config.inc.php'");
-+    $error = checkPermissions('/etc/eventum/config.php', "File '/etc/eventum/config.php'");
++    $error = checkPermissions('/etc/webapps/eventum/config.php', "File '/etc/webapps/eventum/config.php'");
      if (!empty($error)) {
          $errors[] = $error;
      }
@@ -131,12 +131,12 @@
          $errors[] = $error;
      }
 -    $error = checkPermissions('../setup.conf.php', "File 'setup.conf.php'");
-+    $error = checkPermissions('/etc/eventum/setup.php', "File '/etc/eventum/setup.php'");
++    $error = checkPermissions('/etc/webapps/eventum/setup.php', "File '/etc/webapps/eventum/setup.php'");
      if (!empty($error)) {
          $errors[] = $error;
      }
 -    $error = checkPermissions('../include/private_key.php', "File 'include/private_key.php'");
-+    $error = checkPermissions('/etc/eventum/private_key.php', "File '/etc/eventum/private_key.php'");
++    $error = checkPermissions('/etc/webapps/eventum/private_key.php', "File '/etc/webapps/eventum/private_key.php'");
      if (!empty($error)) {
          $errors[] = $error;
      }
@@ -146,8 +146,8 @@
      // check if config.inc.php in the root directory is writable
 -    if (!is_writable('../config.inc.php')) {
 -        return "The file 'config.inc.php' in Eventum's root directory needs to be writable by the web server user. Please correct this problem and try again.";
-+    if (!is_writable('/etc/eventum/config.php')) {
-+        return "The file '/etc/eventum/config.php' needs to be writable by the web server user. Please correct this problem and try again.";
++    if (!is_writable('/etc/webapps/eventum/config.php')) {
++        return "The file '/etc/webapps/eventum/config.php' needs to be writable by the web server user. Please correct this problem and try again.";
      }
      // gotta check and see if the provided installation path really exists...
      if (!file_exists($HTTP_POST_VARS['path'])) {
@@ -157,19 +157,19 @@
  ?>';
 -    if (!is_writable('../include/private_key.php')) {
 -        return "The file 'include/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
-+    if (!is_writable('/etc/eventum/private_key.php')) {
-+        return "The file '/etc/eventum/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
++    if (!is_writable('/etc/webapps/eventum/private_key.php')) {
++        return "The file '/etc/webapps/eventum/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
      }
 -    $fp = @fopen('../include/private_key.php', 'w');
-+    $fp = @fopen('/etc/eventum/private_key.php', 'w');
++    $fp = @fopen('/etc/webapps/eventum/private_key.php', 'w');
      if ($fp === FALSE) {
 -        return "Could not open the file 'include/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
-+        return "Could not open the file '/etc/eventum/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
++        return "Could not open the file '/etc/webapps/eventum/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
      }
      $res = fwrite($fp, $private_key);
      if ($fp === FALSE) {
 -        return "Could not write the configuration information to 'include/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
-+        return "Could not write the configuration information to '/etc/eventum/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
++        return "Could not write the configuration information to '/etc/webapps/eventum/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
      }
      fclose($fp);
      // check if we can connect
@@ -245,7 +245,7 @@
      }
  
 -    $fp = @fopen('../config.inc.php', 'w');
-+    $fp = @fopen('/etc/eventum/config.php', 'w');
++    $fp = @fopen('/etc/webapps/eventum/config.php', 'w');
      if ($fp === FALSE) {
          return "Could not open the file 'config.inc.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
      }