From 2522e3cea3770f90777913887502a4a11f79039a Mon Sep 17 00:00:00 2001 From: opensides Date: Fri, 2 Oct 2009 14:13:46 +0000 Subject: [PATCH] - Updated manpage for new ldap retry parameter (Closes #730) - Updated manpage to show parameter by default and not true | false - Adapted default value in arp hander section to false to match config of - server.conf git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14484 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-si/gosa-si-server | 2 +- gosa-si/gosa-si-server.conf.5 | 5 ++++- gosa-si/server.conf.pod | 14 +++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 2efd73478..3cb1c23ac 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -286,7 +286,7 @@ our $check_periodic = {"months"=>'', "weeks"=>'', "days"=>'', "hours"=>'', "minu "synchronization-loop" => [\$modified_jobs_loop_delay, 5], }, "ArpHandler" => { - "enabled" => [\$arp_enabled, "true"], + "enabled" => [\$arp_enabled, "false"], "interface" => [\$arp_interface, "all"], }, "Opsi" => { diff --git a/gosa-si/gosa-si-server.conf.5 b/gosa-si/gosa-si-server.conf.5 index a598c4b8f..a980a9ef9 100644 --- a/gosa-si/gosa-si-server.conf.5 +++ b/gosa-si/gosa-si-server.conf.5 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "SERVER.CONF 1" -.TH SERVER.CONF 1 "2009-09-22" "perl v5.10.0" "User Contributed Perl Documentation" +.TH SERVER.CONF 1 "2009-10-02" "perl v5.10.0" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -204,6 +204,9 @@ Defines the password of the administrator. .IP "ldap-version = 3" 4 .IX Item "ldap-version = 3" Define the ldap protocol version used +.IP "ldap-retry-sec = 10" 4 +.IX Item "ldap-retry-sec = 10" +Define the number of second gosa-si-server should wait if ldap is not available .IP "gosa-unit-tag =" 4 .IX Item "gosa-unit-tag =" Forces the Unit-Tag in a tagged environment. If not set, GOsa-SI tries to get the tag from the server entry in \s-1LDAP\s0. diff --git a/gosa-si/server.conf.pod b/gosa-si/server.conf.pod index 9570cf5a2..2ad848e68 100644 --- a/gosa-si/server.conf.pod +++ b/gosa-si/server.conf.pod @@ -105,6 +105,10 @@ Defines the password of the administrator. Define the ldap protocol version used +=item ldap-retry-sec = 10 + +Define the number of second gosa-si-server should wait if ldap is not available + =item gosa-unit-tag = Forces the Unit-Tag in a tagged environment. If not set, GOsa-SI tries to get the tag from the server entry in LDAP. @@ -186,7 +190,7 @@ the user is marked to be no longer logged in or the host is no longer running. Comma seperated list of GOsa-si-servers (1.2.3.4:20081,9.8.7.6:123) in network where this SI-server should register. These given SI-servers extend the list of SI-servers found in DNS. -=item dns-lookup = true | false +=item dns-lookup = true Perform a DNS lookup for server registration @@ -202,7 +206,7 @@ Defines the password incoming ServerPackages messages should be encrypted. This Defines the lifetime in seconds of a GOsa-SI-server key. After expiring the key will be automatically renewed. -=item job-synchronization-enabled = true | false +=item job-synchronization-enabled = true Defines whether job queue informations are be shared with other GOsa-SI-server in network. @@ -217,7 +221,7 @@ Defines in seconds after which time the job queue synchronization is being done. =over -=item enabled = true | false +=item enabled = false Defines whether the ArpHandler is being activated at GOsa-SI-server start. @@ -231,7 +235,7 @@ Space- or comma-separated list of interfaces on which to start an ARP-Daemon. En =over 4 -=item enabled = true | false +=item enabled = false Defines wheter Opsi integration is being enabled or not. @@ -243,7 +247,7 @@ Define the hostname of the Opsi server Define the name of the opsi admin -=item password = +=item password = Define the Opsi admin password -- 2.30.2