X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fcontrib%2Fgosa.conf;h=e3d5f06be9018240d65d647d9095e563786a277d;hb=2bcc194f7b80c111f92d82dd4a58085743a3e44f;hp=48cabeebc33bf0031fff465ad5e0dff7049dde4f;hpb=d8bb6b08489d7ded1368b838cd034a1feddc7606;p=gosa.git
diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 48cabeebc..e3d5f06be 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -38,11 +38,7 @@
-{if $cv.use_netatalk}
-{else}
-
-{/if}
@@ -56,23 +52,16 @@
+
-{if $cv.enableMimeType}
-{else}
-
-{/if}
-
+
-{if $cv.enableFAI_management}
-
-{else}
-
-{/if}
+
@@ -85,8 +74,8 @@
-
-
+
+
@@ -119,7 +108,7 @@
-{if $cv.use_netatalk} {else} {/if}
+
@@ -183,7 +172,6 @@
-
@@ -192,13 +180,8 @@
-{if $cv.enableFAI_management}
-
-{else}
-
-
-{/if}
+
@@ -209,13 +192,8 @@
-{if $cv.enableFAI_management}
-
-{else}
-
-
-{/if}
+
@@ -255,12 +233,8 @@
-{if $cv.generic_settings.enableDHCP}
-{/if}
-{if $cv.generic_settings.enableDNS}
-{/if}
@@ -285,6 +259,11 @@
+
+
+
+
+
@@ -301,7 +280,11 @@
{if $cv.mail == "kolab"}
-
+
+{else}
+
{/if}
@@ -327,8 +310,6 @@
-
-{if $cv.enableFAI_management}
@@ -357,39 +338,16 @@
-{else}
-
-{/if}
+
+
+
+
+
+
+
+
@@ -458,38 +416,39 @@
warnSSL="false"
{/if}
{if $cv.optional.ppd_path_active}
- ppdPath="{$cv.optional.ppd_path}"
+ ppdGzip="true"
+ ppdPath="{$cv.optional.ppd_path}"
{/if}
{if $cv.optional.max_ldap_query_time_active}
- ldapMaxQueryTime="{$cv.optional.max_ldap_query_time}"
+ ldapMaxQueryTime="{$cv.optional.max_ldap_query_time}"
{/if}
{if $cv.optional.noprimarygroup}
- primaryGroupFilter="true"
+ primaryGroupFilter="true"
{/if}
{if $cv.optional.mailQueueScriptPath_active}
- mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
+ mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
{/if}
{if $cv.optional.user_filter_cookie}
- storeFilterSettings="true"
+ storeFilterSettings="true"
{else}
- storeFilterSettings="false"
+ storeFilterSettings="false"
{/if}
{if $cv.compressed}
- sendCompressedOutput="true"
+ sendCompressedOutput="true"
{else}
- sendCompressedOutput="false"
+ sendCompressedOutput="false"
{/if}
{if $cv.optional.uniq_identifier_active }
- modificationDetectionAttribute="{$cv.optional.uniq_identifier}"
+ modificationDetectionAttribute="{$cv.optional.uniq_identifier}"
{else}
- modificationDetectionAttribute=""
-{/if}
- language="{$cv.lang_selected}"
- theme="{$cv.theme}"
- sessionLifetime="{$cv.optional.session_lifetime}"
- templateCompileDirectory="{$cv.optional.compile}"
- debugLevel="{$cv.optional.debuglevel}"
- sambaHashHook='{$cv.samba_settings.smbhash}'
+ modificationDetectionAttribute=""
+{/if}
+ language="{$cv.lang_selected}"
+ theme="{$cv.theme}"
+ sessionLifetime="{$cv.optional.session_lifetime}"
+ templateCompileDirectory="{$cv.optional.compile}"
+ debugLevel="{$cv.optional.debuglevel}"
+ sambaHashHook='{$cv.samba_settings.smbhash}'
>
@@ -504,6 +463,13 @@
{if $cv.optional.sudoou_active}
sudoRDN="{$cv.optional.sudoou}"
{/if}
+{if $cv.optional.gosaSupportURI_active}
+ gosaSupportURI="{$cv.optional.gosaSupportURI}"
+ gosaSupportTimeout="{$cv.optional.gosaSupportTimeout}"
+{else}
+ disabled_gosaSupportURI="gosa-si-secret@server:20081}"
+ disabled_gosaSupportTimeout="15"
+{/if}
{if $cv.optional.login_attribute}
loginAttribute="{$cv.optional.login_attribute}"
{else}
@@ -536,7 +502,7 @@
nextIdHook="{$cv.base_hook}"
{/if}
{if $cv.generic_settings.wws_ou_active}
- sambaMachineAccountBase="{$cv.generic_settings.wws_ou}"
+ sambaMachineAccountRDN="{$cv.generic_settings.wws_ou}"
{/if}
{if $cv.id_settings.idgen_active}
idGenerator="{$cv.id_settings.idgen}"
@@ -549,6 +515,11 @@
{if $cv.id_settings.minid_active}
minId="{$cv.id_settings.minid}"
{/if}
+ mailAttribute="{$cv.mail_attrib}"
+ gosaSharedPrefix=""
+ mailUserCreation=""
+ mailFolderCreation=""
+ imapTimeout="10"
{if $cv.mail != "disabled"}
mailMethod="{$cv.mail}"
{if $cv.cyrusunixstyle}
@@ -556,7 +527,6 @@
{else}
cyrusUseSlashes="false"
{/if}
- mailAttribute="{$cv.mail_attrib}"
{if $cv.mail_settings.vacationdir_active}
vacationTemplateDirectory="{$cv.mail_settings.vacationdir}"
{/if}
@@ -601,7 +571,7 @@
{else}
sambaVersion="3"
{/if}
- configBase="ou=gosa,ou=configs,ou=systems,{$cv.base}">
+ config="ou=gosa,ou=configs,ou=systems,{$cv.base}">