X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fcontrib%2Fgosa.conf;h=e3d5f06be9018240d65d647d9095e563786a277d;hb=2bcc194f7b80c111f92d82dd4a58085743a3e44f;hp=dfa588b2f6e1c3acbb771d6de0c7946a3a4ee933;hpb=df574d77cc6b3bf5c8029edccb0382e958e4f623;p=gosa.git
diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index dfa588b2f..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}
@@ -119,7 +108,7 @@
-{if $cv.use_netatalk} {else} {/if}
+
@@ -191,13 +180,8 @@
-{if $cv.enableFAI_management}
-{else}
-
-
-{/if}
@@ -208,13 +192,8 @@
-{if $cv.enableFAI_management}
-{else}
-
-
-{/if}
@@ -254,12 +233,8 @@
-{if $cv.generic_settings.enableDHCP}
-{/if}
-{if $cv.generic_settings.enableDNS}
-{/if}
@@ -284,6 +259,11 @@
+
+
+
+
+
@@ -330,8 +310,6 @@
-
-{if $cv.enableFAI_management}
@@ -370,49 +348,6 @@
-{else}
-
-{/if}
-
@@ -481,6 +416,7 @@
warnSSL="false"
{/if}
{if $cv.optional.ppd_path_active}
+ ppdGzip="true"
ppdPath="{$cv.optional.ppd_path}"
{/if}
{if $cv.optional.max_ldap_query_time_active}
@@ -527,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}
@@ -559,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}"
@@ -572,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}
@@ -579,7 +527,6 @@
{else}
cyrusUseSlashes="false"
{/if}
- mailAttribute="{$cv.mail_attrib}"
{if $cv.mail_settings.vacationdir_active}
vacationTemplateDirectory="{$cv.mail_settings.vacationdir}"
{/if}