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 4089820f013fa08474f4e9dac4456d04c7a716db..3d2b7723d03fc70b85cacfc7838cde8e4a095c60 100644 (file)
--- 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 e7338ded30427f54fa2259842ba311d246ff25eb..ffc26f2c1f10814355bc937c9f14ac6ec0e02c5e 100755 (executable)
--- 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 29119d833d42d06a74234a80b0573d15ebd0af39..b69c34782bb7d468d56a3db5c3dc4365b16fd651 100755 (executable)
--- 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;