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

diff --git a/contrib/daemon/gosa-sd b/contrib/daemon/gosa-sd
index ef3eec74c52a57abb4a7764405791ef886000d51..48fc1a4ed1e8c6c5f012c13b8872222572f701fb 100755 (executable)
--- 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 6010ff0e51d0eccfbe7b6b81e955d7dc62233d28..483d3d1bf29ab8237ca38e208f5e884b2b23126f 100755 (executable)
--- 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 46a9b932756c00a9eb366556f2d95379b1abad85..04be5c82cbc29d031a432c95c0b9e9637605a060 100644 (file)
--- 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 56f57c992a04a6611921be9af208e5fb1dbbe054..49eb75281d6c6324fcbf402adf72c89b10160139 100644 (file)
--- 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