From 6611d50d626fbfe7d54336199802bb1fdf409729 Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 9 Apr 2008 07:15:23 +0000 Subject: [PATCH] Updated debian infrastruct git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10287 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/debian/dirs | 1 + gosa-core/debian/gosa.postinst | 4 +- .../patches/03_fix_class_mapping.dpatch | 42 +++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100755 gosa-core/debian/patches/03_fix_class_mapping.dpatch diff --git a/gosa-core/debian/dirs b/gosa-core/debian/dirs index 859fc2f08..fc29e294c 100644 --- a/gosa-core/debian/dirs +++ b/gosa-core/debian/dirs @@ -3,3 +3,4 @@ usr/sbin usr/share/gosa usr/share/gosa/bin var/spool/gosa +var/cache/gosa diff --git a/gosa-core/debian/gosa.postinst b/gosa-core/debian/gosa.postinst index d607d6120..c35f0958f 100644 --- a/gosa-core/debian/gosa.postinst +++ b/gosa-core/debian/gosa.postinst @@ -47,9 +47,11 @@ for source in /usr/bin/convert /usr/bin/lpstat; do fi done -# Fix permission in /var/spool/gosa +# Fix permission in /var/(spool|cache)/gosa chown root.$WEBGROUP -R /var/spool/gosa chmod 770 -R /var/spool/gosa +chown root.$WEBGROUP -R /var/cache/gosa +chmod 770 -R /var/cache/gosa # Add support for RequestHeader a2enmod headers diff --git a/gosa-core/debian/patches/03_fix_class_mapping.dpatch b/gosa-core/debian/patches/03_fix_class_mapping.dpatch new file mode 100755 index 000000000..d42cbd55f --- /dev/null +++ b/gosa-core/debian/patches/03_fix_class_mapping.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_fix_class_mapping.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gosa-core~/include/functions.inc gosa-core/include/functions.inc +--- gosa-core~/include/functions.inc 2008-04-09 08:45:38.000000000 +0200 ++++ gosa-core/include/functions.inc 2008-04-09 09:13:09.000000000 +0200 +@@ -55,7 +55,7 @@ + $svn_revision = '$Revision: 9246 $'; + + /* Include required files */ +-require_once("class_location.inc"); ++require_once("/var/cache/gosa/class.cache"); + require_once ("functions_debug.inc"); + require_once ("accept-to-gettext.inc"); + +diff -urNad gosa-core~/update-gosa gosa-core/update-gosa +--- gosa-core~/update-gosa 2008-04-02 15:58:24.000000000 +0200 ++++ gosa-core/update-gosa 2008-04-09 09:12:56.000000000 +0200 +@@ -21,7 +21,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-define ("GOSA_HOME", dirname(__FILE__)); ++define ("GOSA_HOME", "/usr/share/gosa"); + define ("LOCALE_DIR", GOSA_HOME."/locale"); + define ("PLUGSTATE_DIR", GOSA_HOME."/state"); + +@@ -122,8 +122,8 @@ + function rescan_classes() + { + echo "Updating class cache...\n"; +- $class_mapping= get_classes(); +- $filename= GOSA_HOME."/include/class_location.inc"; ++ $class_mapping= get_classes("/usr/share/gosa"); ++ $filename= "/var/cache/gosa/class.cache"; + + /* Sanity checks */ + if (!file_exists($filename) || is_writable($filename)) { -- 2.30.2