X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fgosa.conf;h=a5287ab499ee761a21f48c0216106eca7dfb2695;hb=46d030ad05c2c5aefb8d1f1cbe1983fa252feb86;hp=6ebd81c10b40e650fee3cc29c8016b2176f335f9;hpb=4387b15e74807304b8f028860303370c0b393725;p=gosa.git
diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 6ebd81c10..a5287ab49 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -7,7 +7,9 @@
@@ -58,6 +60,8 @@
path="plugins/gofon/macro" />
+
@@ -75,9 +79,17 @@
path="plugins/addons/ldapmanager" />
+
+
+
+
+
@@ -124,6 +136,7 @@
+
@@ -132,6 +145,7 @@
+
@@ -141,16 +155,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
{if $cv.mail == "kolab"}
@@ -169,16 +196,9 @@
+
-
-
-
-
-
-
-
-
@@ -204,8 +224,8 @@
+
@@ -265,10 +285,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"
@@ -280,6 +300,11 @@
{else}
forcessl="false"
{/if}
+{if $cv.optional.ldapstats}
+ ldapstats="true"
+{else}
+ ldapstats="false"
+{/if}
{if $cv.optional.warnssl}
warnssl="true"
{else}
@@ -288,9 +313,6 @@
{if $cv.optional.ppd_path_active}
ppd_path="{$cv.optional.ppd_path}"
{/if}
-{if $cv.optional.kde_applications_menu_active}
- kde_applications_menu="{$cv.optional.kde_applications_menu}"
-{/if}
{if $cv.optional.max_ldap_query_time_active}
max_ldap_query_time="{$cv.optional.max_ldap_query_time}"
{/if}
@@ -303,12 +325,17 @@
{if $cv.optional.auto_network_hook_active}
auto_network_hook="{$cv.optional.auto_network_hook} "
{/if}
- lang="{$cv.lang}"
+{if $cv.optional.strict_units}
+ strict_units="true"
+{else}
+ strict_units="false"
+{/if}
+ lang="{$cv.lang_selected}"
theme="{$cv.theme}"
session_lifetime="{$cv.optional.session_lifetime}"
compile="{$cv.optional.compile}"
debuglevel="{$cv.optional.debuglevel}"
- smbhash='{$cv.optional.smbhash}'
+ smbhash='{$cv.samba_settings.smbhash}'
>