From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 4 Jan 2008 10:07:08 +0000 (+0000)
Subject: Updated debian infrastructure
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=29af04704d0ad1d0cb21c7173511214a8005aeb7;p=gosa.git

Updated debian infrastructure


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

diff --git a/gosa-si/debian/gosa-si-common.postinst b/gosa-si/debian/gosa-si-common.postinst
index 4089820f0..3d2b7723d 100644
--- a/gosa-si/debian/gosa-si-common.postinst
+++ b/gosa-si/debian/gosa-si-common.postinst
@@ -11,5 +11,5 @@ case "$1" in
         *)                     exit 0;
 esac
 
-[ ! -d /var/lib/gosa-si ] && install -d -o root -g root -m 750 /var/lib/gosa-si
+[ -d /var/lib/gosa-si ] || install -d -o root -g root -m 750 /var/lib/gosa-si
 
diff --git a/gosa-si/debian/rules b/gosa-si/debian/rules
index e7338ded3..ffc26f2c1 100755
--- a/gosa-si/debian/rules
+++ b/gosa-si/debian/rules
@@ -60,7 +60,7 @@ binary-indep: install
 	dh_installexamples
 	dh_installchangelogs
 	#dh_installdebconf
-	dh_installinit --init-script=gosa-si
+	dh_installinit -pgosa-si-server --init-script=gosa-si
 	dh_link
 	dh_strip
 	dh_compress
diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 29119d833..b69c34782 100755
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -967,43 +967,43 @@ sub new_ldap_config {
     }
 
     # Setup ldap.conf
-    my $file;
+    my $file1;
     my $file2;
-    open(file, "> $ldap_config");
-    print file "# This file was automatically generated by gosa-si-client. Do not change.\n";
-    print file "URI";
+    open(file1, "> $ldap_config");
+    print file1 "# This file was automatically generated by gosa-si-client. Do not change.\n";
+    print file1 "URI";
     foreach $element (@ldap_uris) {
-    	print file " $element";
+    	print file1 " $element";
     }
-    print file "\nBASE $ldap_base\n";
+    print file1 "\nBASE $ldap_base\n";
     foreach $element (@ldap_options) {
-    	print file "$element\n";
+    	print file1 "$element\n";
     }
-    close (file);
+    close (file1);
     daemon_log("wrote $ldap_config", 5);
 
     # Setup pam_ldap.conf / libnss_ldap.conf
-    open(file, "> $pam_config");
+    open(file1, "> $pam_config");
     open(file2, "> $nss_config");
-    print file "# This file was automatically generated by gosa-si-client. Do not change.\n";
+    print file1 "# This file was automatically generated by gosa-si-client. Do not change.\n";
     print file2 "# This file was automatically generated by gosa-si-client. Do not change.\n";
-    print file "uri";
+    print file1 "uri";
     print file2 "uri";
     foreach $element (@ldap_uris) {
-    	print file " $element";
+    	print file1 " $element";
     	print file2 " $element";
     }
-    print file "\nbase $ldap_base\n";
+    print file1 "\nbase $ldap_base\n";
     print file2 "\nbase $ldap_base\n";
     foreach $element (@pam_options) {
-    	print file "$element\n";
+    	print file1 "$element\n";
     }
     foreach $element (@nss_options) {
     	print file2 "$element\n";
     }
     close (file2);
     daemon_log("wrote $nss_config", 5);
-    close (file);
+    close (file1);
     daemon_log("wrote $pam_config", 5);
 
     return;