From f7a03352e0f48b19ea831a7c7524ccba8c27cc2b Mon Sep 17 00:00:00 2001
From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 6 Dec 2007 08:34:09 +0000
Subject: [PATCH] gosa-sd and gosa-sd-bus - change of config file

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8035 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 contrib/daemon/gosa-sd                  | 10 +++++-----
 contrib/daemon/gosa-sd-bus              |  7 +++----
 contrib/daemon/gosa-sd-bus.cfg-template |  7 +++----
 contrib/daemon/gosa-sd.cfg-template     |  6 +++---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/contrib/daemon/gosa-sd b/contrib/daemon/gosa-sd
index ef3eec74c..48fc1a4ed 100755
--- a/contrib/daemon/gosa-sd
+++ b/contrib/daemon/gosa-sd
@@ -98,16 +98,15 @@ our $shmcl = tie($known_clients, 'IPC::Shareable', undef, {create => 1,
 ("general" =>
     {"log_file" => [\$log_file, "/var/run/".$0.".log"],
     "pid_file" => [\$pid_file, "/var/run/".$0.".pid"],
-    },
+    "child_max" => [\$child_max, 10],
+    "child_min" => [\$child_min, 3],
+    "child_timeout" => [\$child_timeout, 180],
+   },
 "bus" =>
     {"bus_activ" => [\$bus_activ, "on"],
     "bus_passwd" => [\$bus_passwd, "tester"],
     "bus_ip" => [\$bus_ip, "10.89.1.155"],
     "bus_port" => [\$bus_port, "10001"],
-    "child_max" => [\$child_max, 10],
-    "child_min" => [\$child_min, 3],
-    "child_timeout" => [\$child_timeout, 180],
-
     },
 "server" =>
     {"server_activ" => [\$server_activ, "on"],
@@ -1957,6 +1956,7 @@ while(1) {
             daemon_log("accept client from $actual_ip", 5);
             my $in_msg = <$client>;
             #my $in_msg = &read_from_socket($client);
+            #daemon_log(">>>>>>>>>>> frisch vom socket gelesen\n$in_msg\n",1);
             if(defined $in_msg){
                 chomp($in_msg);
                 &activating_child($in_msg, $actual_ip, $client);
diff --git a/contrib/daemon/gosa-sd-bus b/contrib/daemon/gosa-sd-bus
index 6010ff0e5..483d3d1bf 100755
--- a/contrib/daemon/gosa-sd-bus
+++ b/contrib/daemon/gosa-sd-bus
@@ -52,16 +52,15 @@ $shmkh = tie($known_daemons, 'IPC::Shareable', undef, {create => 1,
 ("general" =>
     {"log_file" => [\$log_file, "/var/run/".$0.".log"],
     "pid_file" => [\$pid_file, "/var/run/".$0.".pid"],
+    "child_max" => [\$child_max, 10],
+    "child_min" => [\$child_min, 3],
+    "child_timeout" => [\$child_timeout, 180],
 
     },
 "bus" =>
     {"bus_activ" => [\$bus_activ, "on"],
     "bus_passwd" => [\$bus_passwd, "tester"],
-#    "bus_ip" => [\$bus_ip, "10.89.1.155"],
     "bus_port" => [\$bus_port, "10001"],
-    "child_max" => [\$child_max, 10],
-    "child_min" => [\$child_min, 3],
-    "child_timeout" => [\$child_timeout, 180],
     }
     );
 
diff --git a/contrib/daemon/gosa-sd-bus.cfg-template b/contrib/daemon/gosa-sd-bus.cfg-template
index 46a9b9327..04be5c82c 100644
--- a/contrib/daemon/gosa-sd-bus.cfg-template
+++ b/contrib/daemon/gosa-sd-bus.cfg-template
@@ -1,14 +1,13 @@
 [general]
 log_file = /var/log/gosa-sd-bus.log
 pid_file = /var/run/gosa-sd-bus.pid
+child_max = 10
+child_min = 2
+child_timeout = 10
 
 [bus]
 bus_activ = on
 bus_passwd = hallali
 bus_ip = 10.89.1.155
 bus_port = 10000
-child_max = 10
-child_min = 2
-child_timeout = 10
-
 
diff --git a/contrib/daemon/gosa-sd.cfg-template b/contrib/daemon/gosa-sd.cfg-template
index 56f57c992..49eb75281 100644
--- a/contrib/daemon/gosa-sd.cfg-template
+++ b/contrib/daemon/gosa-sd.cfg-template
@@ -1,15 +1,15 @@
 [general]
 log_file = /var/log/gosa-sd.log
 pid_file = /var/run/gosa-sd.pid
+child_max = 10
+child_min = 2
+child_timeout = 10
 
 [bus]
 bus_activ = on
 bus_passwd = hallali
 bus_ip = 10.89.1.155
 bus_port = 10000
-child_max = 10
-child_min = 2
-child_timeout = 10
 
 [server]
 server_activ = on
-- 
2.30.2