Layout fixes

[gosa.git] / contrib / gosa.conf

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index b4de9cee84a929d7f22ce01082fe3c9f74b2130a..3e911d393e6f999a1ec22c5935e242cb2aff9c2a 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -7,7 +7,9 @@
                        <plugin acl="default" class="posixAccount" icon="posix.png"
                                path="plugins/personal/posix" />
                        <plugin acl="default" class="environment" icon="env.png"
-                               kioskpath="/var/spool/kiosk"
+{if $cv.optional.kioskpath_active}
+                               kioskpath="{$cv.optional.kioskpath}"
+{/if}
                                path="plugins/personal/environment" />
                        <plugin acl="default" class="mailAccount" icon="email.png"
                                path="plugins/personal/mail" />
@@ -271,10 +273,10 @@
 {else}
                schema_check="false"
 {/if}
-{if $cv.optional.enableCopyPaste}
-               enableCopyPaste="true" 
+{if $cv.generic_settings.enableCopyPaste}
+               enableCopyPaste="true"
 {else}
-               enableCopyPaste="false" 
+               enableCopyPaste="false"
 {/if}
 {if $cv.optional.forceglobals}
                forceglobals="true"
@@ -327,6 +329,21 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
+{if $cv.krbsasl}
+                       krbsasl="true"
+{else}
+                       krbsasl="false"
+{/if}
+{if $cv.rfc2307bis}
+                       rfc2307bis="true"
+{else}
+                       rfc2307bis="false"
+{/if}
+{if $cv.include_personal_title}
+                       include_personal_title="true"
+{else}
+                       include_personal_title="false"
+{/if}
 {if $cv.optional.notifydir_active }
                        notifydir="{$cv.optional.notifydir}"
 {/if}
@@ -340,9 +357,9 @@
                        idgen="{$cv.id_settings.idgen}"
 {/if}
 {if $cv.strict}
-                       strict="no"
-{else}
                        strict="yes"
+{else}
+                       strict="no"
 {/if}
 {if $cv.id_settings.minid_active}
                        minid="{$cv.id_settings.minid}"
@@ -383,9 +400,6 @@
 {if $cv.generic_settings.snapshot_base != ""}
                        snapshot_base="{$cv.generic_settings.snapshot_base}"
 {/if}
-{if $cv.generic_settings.snapshot_ldap_base != ""}
-                       snapshot_ldap_base="{$cv.generic_settings.snapshot_ldap_base}"
-{/if}
 {if $cv.generic_settings.snapshot_user != ""}
                        snapshot_user="{$cv.generic_settings.snapshot_user}"
 {/if}