- Added missing parameters for gosa-si

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

diff --git a/gosa-si/client.conf.pod b/gosa-si/client.conf.pod
index e8a579a7ba2b763116f3d88875335a83dbe9eaaf..34bd2ee89ee4e102f05bcec62e0f68b30411c196 100644 (file)
--- a/gosa-si/client.conf.pod
+++ b/gosa-si/client.conf.pod
@@ -22,6 +22,10 @@ Defines the location for the log file.
 
 Defines the location for the pid file.
 
+=item opts-file = var/run/gosa-si-client.opts
+
+Defines the location for the opts file.
+
 =back
 
 
@@ -69,6 +73,10 @@ Defines the location for fai.log file.
 
 If set to true, client will try to get the hostname for registration from $ENV. Used in FAI environments, when hostname gets set from DHCP.
 
+=item system-com = disabled | enabled
+
+Open a different fifo for system communication
+
 =back
 
 

diff --git a/gosa-si/gosa-si-client.conf.5 b/gosa-si/gosa-si-client.conf.5
index 34817d8dc312da20fbda54d4e15622bd5aa7ce87..0f405d486a8c12b3389e76de69f69ebc8d7d9723 100644 (file)
--- a/gosa-si/gosa-si-client.conf.5
+++ b/gosa-si/gosa-si-client.conf.5
@@ -144,6 +144,9 @@ Defines the location for the log file.
 .IP "pid-file = /var/run/gosa\-si\-client.pid" 4
 .IX Item "pid-file = /var/run/gosa-si-client.pid"
 Defines the location for the pid file.
+.IP "opts-file = var/run/gosa\-si\-client.opts" 4
+.IX Item "opts-file = var/run/gosa-si-client.opts"
+Defines the location for the opts file.
 .SS "[client]"
 .IX Subsection "[client]"
 .IP "port = 20083" 4
@@ -176,6 +179,9 @@ Defines the location for fai.log file.
 .IP "force-hostname = false | true" 4
 .IX Item "force-hostname = false | true"
 If set to true, client will try to get the hostname for registration from \f(CW$ENV\fR. Used in \s-1FAI\s0 environments, when hostname gets set from \s-1DHCP\s0.
+.IP "system-com = disabled | enabled" 4
+.IX Item "system-com = disabled | enabled"
+Open a different fifo for system communication
 .SS "[server]"
 .IX Subsection "[server]"
 .IP "ip = 127.0.0.1" 4

diff --git a/gosa-si/gosa-si-server.conf.5 b/gosa-si/gosa-si-server.conf.5
index cc47349dfd092c1ff8e51dec5586efe8e37f72b5..06a582a3f2230db9636ef9ac239c8fedb2fab177 100644 (file)
--- a/gosa-si/gosa-si-server.conf.5
+++ b/gosa-si/gosa-si-server.conf.5
@@ -198,6 +198,9 @@ Defines the distinguished name of the administrator.
 .IP "ldap-admin-password =" 4
 .IX Item "ldap-admin-password ="
 Defines the password of the administrator.
+.IP "ldap-version = 3" 4
+.IX Item "ldap-version = 3"
+Define the ldap protocol version used
 .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.
@@ -221,6 +224,9 @@ Defines the seconds the messaging queue is checked.
 .IP "key = none" 4
 .IX Item "key = none"
 Defines the password incoming GOsaPackages messages should be encrypted. This has to be modified, default value will not work!!!
+.IP "new-systems-ou = ou=workstations,ou=systems" 4
+.IX Item "new-systems-ou = ou=workstations,ou=systems"
+Define the branch in your ldap tree where new systems should be put, only change if you know what you are doing !!!
 .IP "dak-base = /srv/archive" 4
 .IX Item "dak-base = /srv/archive"
 Base Directory of the local dak Archive.
@@ -238,11 +244,18 @@ User that is used to access dak files. Only needed if you have manually changed
 .IP "key = none" 4
 .IX Item "key = none"
 Defines the password incoming ClientPackages messages should be encrypted. This has to be modified, default value will not work!!!
+.IP "user-date-of-expiry = 600" 4
+.IX Item "user-date-of-expiry = 600"
+Lifetime of logged in user information. If no update information comes after n seconds,
+the user is marked to be no longer logged in or the host is no longer running.
 .SS "[ServerPackages]"
 .IX Subsection "[ServerPackages]"
 .IP "address =" 4
 .IX Item "address ="
 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 \s-1DNS\s0.
+.IP "dns-lookup = true | false" 4
+.IX Item "dns-lookup = true | false"
+Perform a \s-1DNS\s0 lookup for server registration
 .IP "domain =" 4
 .IX Item "domain ="
 Forces the search domain used to get possible foreign servers from \s-1DNS\s0. If not set, this server will search the domains found in domain or search statement in /etc/resolv.conf.
@@ -266,6 +279,20 @@ Defines whether the ArpHandler is being activated at GOsa-SI-server start.
 .IP "interface = all" 4
 .IX Item "interface = all"
 Space\- or comma-separated list of interfaces on which to start an ARP-Daemon. Enter 'all' to use all possible interfaces (Default).
+.SS "[Opsi]"
+.IX Subsection "[Opsi]"
+.IP "enabled = true | false" 4
+.IX Item "enabled = true | false"
+Defines wheter Opsi integration is being enabled or not.
+.IP "server = localhost" 4
+.IX Item "server = localhost"
+Define the hostname of the Opsi server
+.IP "admin = opsi-admin" 4
+.IX Item "admin = opsi-admin"
+Define the name of the opsi admin
+.IP "password =" 4
+.IX Item "password ="
+Define the Opsi admin password
 .SH "BUGS"
 .IX Header "BUGS"
 Please report any bugs, or post any suggestions, to the GOsa mailing list <gosa\-devel@oss.gonicus.de> or to <https://oss.gonicus.de/labs/gosa>

diff --git a/gosa-si/server.conf.pod b/gosa-si/server.conf.pod
index 1af04d35bc8e2cb2e383811421c18be2ced8d5f1..fd94ac56a92a9339d4fead4e7cc9443c5caef6df 100644 (file)
--- a/gosa-si/server.conf.pod
+++ b/gosa-si/server.conf.pod
@@ -97,6 +97,10 @@ Defines the distinguished name of the administrator.
 
 Defines the password of the administrator.
 
+=item ldap-version = 3
+
+Define the ldap protocol version used
+
 =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.
@@ -131,6 +135,10 @@ Defines the seconds the messaging queue is checked.
 
 Defines the password incoming GOsaPackages messages should be encrypted. This has to be modified, default value will not work!!!
 
+=item new-systems-ou = ou=workstations,ou=systems
+
+Define the branch in your ldap tree where new systems should be put, only change if you know what you are doing !!!
+
 =item dak-base = /srv/archive
 
 Base Directory of the local dak Archive.
@@ -158,6 +166,11 @@ User that is used to access dak files. Only needed if you have manually changed
 
 Defines the password incoming ClientPackages messages should be encrypted. This has to be modified, default value will not work!!!
 
+=item user-date-of-expiry = 600
+
+Lifetime of logged in user information. If no update information comes after n seconds,
+the user is marked to be no longer logged in or the host is no longer running.
+
 =back
 
 
@@ -169,6 +182,10 @@ Defines the password incoming ClientPackages messages should be encrypted. This
 
 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
+
+Perform a DNS lookup for server registration
+
 =item domain =
 
 Forces the search domain used to get possible foreign servers from DNS. If not set, this server will search the domains found in domain or search statement in /etc/resolv.conf.
@@ -206,6 +223,27 @@ Space- or comma-separated list of interfaces on which to start an ARP-Daemon. En
 
 =back
 
+=head2 [Opsi]
+
+=over 4
+
+=item enabled = true | false
+
+Defines wheter Opsi integration is being enabled or not.
+
+=item server = localhost
+
+Define the hostname of the Opsi server
+
+=item admin = opsi-admin
+
+Define the name of the opsi admin
+
+=item password = 
+
+Define the Opsi admin password
+
+=back
 
 =head1 BUGS