Unified config parameters

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

diff --git a/gosa-si/bus.conf b/gosa-si/bus.conf
index aaf30199fe58946f765078d53387ca2144995dbe..699b35f99bb44d16c8805da1f42fb458bfc904eb 100644 (file)
--- a/gosa-si/bus.conf
+++ b/gosa-si/bus.conf
@@ -1,11 +1,7 @@
 [general]
-log_file = /var/log/gosa-si-bus.log
-pid_file = /var/run/gosa-si-bus.pid
+log-file = /var/log/gosa-si-bus.log
+pid-file = /var/run/gosa-si-bus.pid
 
 [bus]
-ip = 0.0.0.0
-port = 20080
 key = secret-bus-password
-bus_known_server_file_name = /var/lib/gosa-si/gosa-si-bus_known_server.db
-bus_known_clients_file_name = /var/lib/gosa-si/gosa-si-bus_known_clients.db
 

diff --git a/gosa-si/client.conf b/gosa-si/client.conf
index f2cfeb0144c2fc4f34cf8708475e8dc137a2f4d1..60db7a38d669e59da31b9446011c24430085221a 100644 (file)
--- a/gosa-si/client.conf
+++ b/gosa-si/client.conf
@@ -1,9 +1,9 @@
 [general]
-log_file = /var/log/gosa-si-client.log
-pid_file = /var/run/gosa-si-client.pid
+log-file = /var/log/gosa-si-client.log
+pid-file = /var/run/gosa-si-client.pid
 
 [client]
-fai_logpath = /tmp/fai.log
+fai-logpath = /tmp/fai.log
 
 [server]
 key = secret-server-password

diff --git a/gosa-si/gosa-si-bus b/gosa-si/gosa-si-bus
index f3a9b47d0841662e5f4ab5dcc5657740e1fce2e9..7d436d3068ae6b814af21963ef2c163c3ae19e35 100755 (executable)
--- a/gosa-si/gosa-si-bus
+++ b/gosa-si/gosa-si-bus
@@ -52,8 +52,8 @@ $foreground = 0 ;
     "key"  => [\$bus_key, "secret-bus-password"],
     "ip"   => [\$bus_ip, "0.0.0.0"],
     "port" => [\$bus_port, "20080"],
-    "bus_known_server_file_name" => [\$bus_known_server_file_name, "/var/lib/gosa-si/gosa-si-bus_known_server.db"],
-    "bus_known_clients_file_name" => [\$bus_known_clients_file_name, "/var/lib/gosa-si/gosa-si-bus_known_clients.db"],
+    "known-servers" => [\$bus_known_server_file_name, "/var/lib/gosa-si/bus-servers.db"],
+    "known-clients" => [\$bus_known_clients_file_name, "/var/lib/gosa-si/bus-clients.db"],
    }, 
 );
 

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index b4d3a2e9f31fef10c9c73e1af6baff9d5dc3346f..456f70a9c8d8b640535bb4db2f64e77847fdcc18 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -59,26 +59,26 @@ our $REGISTERED_FLAG = 1;
 
 %cfg_defaults = (
 "general" =>
-    {"log_file"           => [\$log_file, "/var/run/".$0.".log"],
-    "pid_file"            => [\$pid_file, "/var/run/".$0.".pid"],
-    "fai_logpath"         => [\$fai_logpath, "/var/log/fai/fai.log"],
+    {"log-file"           => [\$log_file, "/var/run/".$0.".log"],
+    "pid-file"            => [\$pid_file, "/var/run/".$0.".pid"],
+    "fai-logpath"         => [\$fai_logpath, "/var/log/fai/fai.log"],
     },
 "client" => 
     {"port"        => [\$client_port, "20083"],
      "ip"          => [\$client_ip, "0.0.0.0"],
-     "mac_address" => [\$client_mac_address, "00:00:00:00:00:00"],
-     "server_domain"       => [\$server_domain, ""],
+     "mac-address" => [\$client_mac_address, "00:00:00:00:00:00"],
+     "server-domain"       => [\$server_domain, ""],
      "ldap"               => [\$ldap_enabled, 1],
-     "ldap_config"        => [\$ldap_config, "/etc/ldap/ldap.conf"],
-     "pam_config"         => [\$pam_config, "/etc/pam_ldap.conf"],
-     "nss_config"         => [\$nss_config, "/etc/libnss_ldap.conf"],
+     "ldap-config"        => [\$ldap_config, "/etc/ldap/ldap.conf"],
+     "pam-config"         => [\$pam_config, "/etc/pam_ldap.conf"],
+     "nss-config"         => [\$nss_config, "/etc/libnss_ldap.conf"],
     },
 "server" => {
     "ip"          => [\$server_ip, "127.0.0.1"],
     "port"         => [\$server_port, "20081"],
     "key"          => [\$server_key, ""],
     "timeout"      => [\$server_timeout, 10],
-    "key_lifetime" => [\$server_key_lifetime, 600], 
+    "key-lifetime" => [\$server_key_lifetime, 600], 
     },
 
 );

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 981870a962f8cf8bffc3ba564fca5269ec564dcd..a46f68c2e7897aa48e57e2d903f3dcad5bd07949 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -96,20 +96,20 @@ our $known_clients_db;
 
 %cfg_defaults = (
 "general" => {
-    "log_file" => [\$log_file, "/var/run/".$0.".log"],
-    "pid_file" => [\$pid_file, "/var/run/".$0.".pid"],
+    "log-file" => [\$log_file, "/var/run/".$0.".log"],
+    "pid-file" => [\$pid_file, "/var/run/".$0.".pid"],
     },
 "server" => {
 #    "ip" => [\$server_ip, "0.0.0.0"],
     "port" => [\$server_port, "20081"],
-    "known_clients_file_name" => [\$known_clients_file_name, '/var/lib/gosa-si/clients.db' ],
-    "known_server_file_name" => [\$known_server_file_name, '/var/lib/gosa-si/servers.db'],
+    "known-clients" => [\$known_clients_file_name, '/var/lib/gosa-si/clients.db' ],
+    "known-servers" => [\$known_server_file_name, '/var/lib/gosa-si/servers.db'],
     },
 "GOsaPackages" => {
     "ip" => [\$gosa_ip, "0.0.0.0"],
     "port" => [\$gosa_port, "20082"],
-    "job_queue_file_name" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'],
-    "job_queue_loop_delay" => [\$job_queue_loop_delay, 3],
+    "job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'],
+    "job-queue-loop-delay" => [\$job_queue_loop_delay, 3],
     "key" => [\$GosaPackages_key, "none"],
     },
 "SIPackages" => {

diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm
index edce8575144c1d006d3064a1fba942ba11c9d1ff..17c2302df2aa8424778f0ec6dce4e85791bd9b6a 100644 (file)
--- a/gosa-si/modules/ArpHandler.pm
+++ b/gosa-si/modules/ArpHandler.pm
@@ -50,7 +50,7 @@ if($lookup_vendor) {
 my %cfg_defaults =
 (
        "arp" => {
-               "arp_activ"           => [\$arp_activ,         "on"],
+               "arp_enabled"           => [\$arp_activ,         "true"],
                "arp_interface"       => [\$arp_interface,    "all"],
        },
        "server" => {
@@ -93,7 +93,7 @@ sub get_module_info {
 
        &read_configfile();
        # Don't start if some of the modules are missing
-       if(($arp_activ eq 'on') && $start_service) {
+       if(($arp_activ eq 'true') && $start_service) {
                $ldap = Net::LDAP->new($ldap_uri);
                if (!$ldap) {
                        &main::daemon_log("Could not connect to LDAP Server at $ldap_uri!\n$@", 1);

diff --git a/gosa-si/server.conf b/gosa-si/server.conf
index 7a136db13f7c53251f3074ce15094cf10363bc69..f9a2882872ab10796f5e72db64709bab12aeaade 100644 (file)
--- a/gosa-si/server.conf
+++ b/gosa-si/server.conf
@@ -1,30 +1,25 @@
 [general]
-log_file = /var/run/gosa-si-server.log
-pid_file = /var/run/gosa-si-server.pid
+log-file = /var/run/gosa-si-server.log
+pid-file = /var/run/gosa-si-server.pid
 
 [bus]
-activ = on
+enabled = false
 key = secret-bus-password
-ip = 127.0.0.1
-port = 20080
 
 [server]
-max_clients = 100
-ldap_uri = 
-ldap_base = 
-ldap_admin_dn = 
-ldap_admin_password = tester
+max-clients = 100
+ldap-uri = ldap://127.0.0.1
+ldap-base = dc=your,dc=domain
+ldap-admin_dn = dc=ldapadmin,dc=your,dc=domain
+ldap-admin_password = tester
 
 [SIPackages]
 key = secret-server-password
 
 [ArpHandler]
-activ = on
-interface = all
+enabled = false
 
 [GOsaPackages]
-activ = on
+enabled = true
 key = secret-gosa-password
-job_queue_file_name = /var/lib/gosa-si/gosa-si-server_jobs.db
-job_queue_loop_delay = 3