From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 2 Jan 2008 15:44:23 +0000 (+0000)
Subject: Updated paths
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad7019b8c306c88a33610385acab96b43592bef0;p=gosa.git

Updated paths


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8183 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-si/debian/rules b/gosa-si/debian/rules
index d74e36f0e..723ddf6fb 100755
--- a/gosa-si/debian/rules
+++ b/gosa-si/debian/rules
@@ -32,11 +32,17 @@ install-stamp:
 
 	# Create a copy, remove svn stuff
 	-mkdir debian/tmp
-	-for i in `ls | grep -v debian`; do \
+	-for i in *; do \
 		cp -R $$i debian/tmp ; \
 	done
 	-find debian/tmp -name '*.svn' -type d -exec rm -rf {} \; 2> /dev/null
 
+	-for i in gosa-si-client gosa-si-server modules/GosaPackages.pm modules/ServerPackages.pm modules/TestModule.pm; do sed -i 's/use GosaSupportDaemon;/use GOSA::GosaSupportDaemon;/g;s/use DBsqlite;/use GOSA::DBsqlite;/g' debian/tmp/$$i; done
+
+	-sed -i 's!use lib "/etc/gosa-si/modules";!use lib "/usr/lib/gosa-si/modules";!g;s!my $modules_path = "/etc/gosa-si/modules";!my $modules_path = "/usr/lib/gosa-si/modules";!g' debian/tmp/gosa-si-server
+
+	-sed -i 's!"/etc/gosa-si/server/events";!"/usr/lib/gosa-si/server/events";!g' debian/tmp/modules/GosaPackages.pm
+
 	touch install-stamp
 
 patch: patch-stamp
@@ -48,7 +54,7 @@ binary-indep: install
 	dh_testdir
 	dh_testroot
 	
-	dh_install
+	dh_install --sourcedir=debian/tmp
 	dh_installdocs 
 	dh_installcron
 	dh_installexamples
diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index afa087216..9ce9b088c 100755
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -112,7 +112,7 @@ our $shmcl = tie($known_clients, 'IPC::Shareable', undef, {create => 1,
     "child_min" => [\$child_min, 3],
     "child_timeout" => [\$child_timeout, 180],
     "job_queue_timeout" => [\$job_queue_timeout, undef],
-    "job_queue_file_name" => [\$job_queue_file_name, '/tmp/jobs.db'],
+    "job_queue_file_name" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'],
    },
 "bus" =>
     {"bus_activ" => [\$bus_activ, "on"],
diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 664c10081..b892d587e 100644
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -20,7 +20,7 @@ my ($gosa_activ, $gosa_ip, $gosa_port, $gosa_passwd);
 my ($job_queue_timeout, $job_queue_file_name);
 
 my $gosa_server;
-my $event_dir = "/home/rettenbe/gonicus/projekte/gosa-trunk/gosa-si/server/events";
+my $event_dir = "/etc/gosa-si/server/events";
 
 # name of table for storing gosa jobs
 my $job_queue_table_name = 'jobs';