Kolab Groupware OBS

Changes of Revision 7

pykolab-0.9.0.tar.gz/pykolab/setup/setup_ldap.py Changed

@@ -56,6 +56,14 @@
         )
 
     ldap_group.add_option(
+            "--domain",
+            dest    = "domain",
+            action  = "store",
+            default = None,
+            help    = _("Specify the domain (defaults to one level up from fqdn).")
+        )
+
+    ldap_group.add_option(
             "--allow-anonymous",
             dest    = "anonymous",
             action  = "store_true",
@@ -248,19 +256,13 @@
 
     # TODO: Verify the user and group exist.
 
-    # TODO: This takes the system fqdn, domainname and hostname, rather then
-    # the desired fqdn, domainname and hostname.
-    #
-    # TODO^2: This should be confirmed.
-
-    if conf.fqdn:
-        _input'fqdn' = conf.fqdn
-        _input'hostname' = conf.fqdn.split('.')0
-        _input'domain' = '.'.join(conf.fqdn.split('.')1:)
+    _input'fqdn' = conf.fqdn
+    _input'hostname' = conf.fqdn.split('.')0
+    if conf.domain:
+        _input'domain' = conf.domain
     else:
-        _input'fqdn' = fqdn
-        _input'hostname' = hostname.split('.')0
-        _input'domain' = domainname
+        _input'domain' = '.'.join(conf.fqdn.split('.')1:)
+
     _input'nodotdomain' = _input'domain'.replace('.','_')
 
     _input'rootdn' = utils.standard_root_dn(_input'domain')