Removed stupid /tmp/fai directory packaged...

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

diff --git a/gosa-si/client.conf b/gosa-si/client.conf
index 8e37c7614a7154c0e94a2c0898819cc4d9e117ab..25cd6b86e4f2ef5f1cf6d86926f416dfce95bb47 100644 (file)
--- a/gosa-si/client.conf
+++ b/gosa-si/client.conf
@@ -3,7 +3,7 @@ log-file = /var/log/gosa-si-client.log
 pid-file = /var/run/gosa-si-client.pid
 
 [client]
-fai-logpath = /tmp/fai/fai.log
+fai-logpath = /var/log/fai/fai.log
 
 [server]
 key = secret-server-password

diff --git a/gosa-si/client/events/opsi.pm b/gosa-si/client/events/opsi.pm
index 9e016e0c354f1679e27539f3214be941e0ae4ba7..128260358ae774e85c95107e8676ebf0da23ff42 100644 (file)
--- a/gosa-si/client/events/opsi.pm
+++ b/gosa-si/client/events/opsi.pm
@@ -16,12 +16,15 @@ my @events = (
 
     #"opsi_add_client",
     # Client hinzufügen
-    # -> voll qualifizierter name
+    # -> voll qualifizierter name == ID
     # -> IP
     # -> MAC
     # -> Description
     # -> Notizen
 
+    #"opsi_del_client",
+    # ID
+
     #"opsi_modify_client",
 
     #"opsi_add_product_to_client",
@@ -706,7 +709,6 @@ sub opsi_del_client {
 }
 
 
-# Setze alles was auf "installed" steht auf setup
 sub opsi_install_client {
     my ($msg, $msg_hash) = @_;
     my $header = @{$msg_hash->{'header'}}[0];
@@ -725,6 +727,7 @@ sub opsi_install_client {
     }
     &add_content2xml_hash($out_hash, "hostId", "$hostId");
 
+# Setze alles was auf "installed" steht auf setup
 # Schaue nach produkten für diesen Host
 # Setze alle Produkte dieses Hosts auf "setup"
 

diff --git a/gosa-si/debian/gosa-si-client.dirs b/gosa-si/debian/gosa-si-client.dirs
index acb6bec1627c1e0aa1d119dfe836647ced44f36a..b3c588b5792df9e4e1eb98747f2a627633f059bb 100644 (file)
--- a/gosa-si/debian/gosa-si-client.dirs
+++ b/gosa-si/debian/gosa-si-client.dirs
@@ -2,4 +2,3 @@ etc/gosa-si
 usr/sbin
 usr/lib/gosa-si/client/events
 usr/lib/share/perl5/GOto
-tmp/fai

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index c62d230e6896c4f986b01243a81b54c05b30bbec..fa2afbdbbdf12f703b801f5ecfac11ee93ca7442 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -87,7 +87,7 @@ our $prg= basename($0);
 my $trigger_logged_in_users_report_delay = 600;
 
 # directory where all log files from installation are stored
-my $fai_log_dir = "/tmp/fai"; 
+my $fai_log_dir = "/var/log/fai"; 
 
 # dak variables
 our $dak_base_directory;

diff --git a/gosa-si/modules/ClientPackages.pm b/gosa-si/modules/ClientPackages.pm
index e940d041b294bdbf2bfc30aa4f9b176bb5f478f7..88a87ad5ced9a9be6bc446a7e49e76e3eedcfc1b 100644 (file)
--- a/gosa-si/modules/ClientPackages.pm
+++ b/gosa-si/modules/ClientPackages.pm
@@ -645,7 +645,7 @@ sub new_ldap_config {
 
        # Do we need to look at an object class?
        if (not @servers){
-            my $escaped_dn = &Net::LDAP::Utils::escape_dn_value($dn);
+          my $escaped_dn = &Net::LDAP::Utils::escape_dn_value($dn);
                $mesg = $ldap_handle->search( base   => $ldap_base,
                        scope  => 'sub',
                        attrs => ['dn', 'gotoLdapServer', 'FAIclass'],