Layout fixes

[gosa.git] / contrib / gosa.conf

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 44541fd3d15d06b614ff63efa81996eb6e859ce8..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" />
@@ -58,6 +60,8 @@
                                path="plugins/gofon/macro" />
                        <plugin acl="conference" class="phoneConferenceManagment" icon="conference.png"
                                path="plugins/gofon/conference" />
+            <plugin acl="acl" class="acl" icon="acl.png"
+                path="plugins/admin/acl" />
                </section>
 
                <section name="Addons">
@@ -75,6 +79,10 @@
                                path="plugins/addons/ldapmanager" />
                        <plugin acl="notifications" class="msgplug" icon="notifications.png"
                                 path="plugins/addons/notifications" />
+<!--
+                       <plugin acl="gotomasses" class="gotomasses" icon="system.png"
+                                path="plugins/addons/gotomasses" />
+-->
                </section>
        </menu>
 
@@ -265,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"
@@ -321,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}
@@ -330,16 +353,16 @@
 {if $cv.generic_settings.wws_ou_active}
                        winstations="{$cv.generic_settings.wws_ou}"
 {/if}
-{if $cv.generic_settings.idgen_active}
-                       idgen="{$cv.generic_settings.idgen}"
+{if $cv.id_settings.idgen_active}
+                       idgen="{$cv.id_settings.idgen}"
 {/if}
 {if $cv.strict}
                        strict="yes"
 {else}
                        strict="no"
 {/if}
-{if $cv.generic_settings.minid_active}
-                       minid="{$cv.generic_settings.minid}"
+{if $cv.id_settings.minid_active}
+                       minid="{$cv.id_settings.minid}"
 {/if}
 {if $cv.mail != "disabled"}
                        mailMethod="{$cv.mail}"
@@ -377,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}