From: hickert Date: Thu, 10 May 2007 07:34:08 +0000 (+0000) Subject: Reverted to old style contrib gosa.conf X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b234e19fc072923bb5be0f011b76a4e15148ecb4;p=gosa.git Reverted to old style contrib gosa.conf git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@6330 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/contrib/gosa.conf b/contrib/gosa.conf index 987666f9e..89922723f 100644 --- a/contrib/gosa.conf +++ b/contrib/gosa.conf @@ -1,4 +1,4 @@ - +{literal}{/literal}
@@ -7,7 +7,9 @@ @@ -21,8 +23,10 @@ path="plugins/gofax/faxaccount" /> - +
@@ -40,7 +44,6 @@ icon="application.png" path="plugins/admin/applications" /> - @@ -69,6 +72,12 @@ path="plugins/addons/mailqueue" /> + +
@@ -82,10 +91,15 @@ - - + + + + + @@ -126,15 +140,13 @@ - {servKolab} - - - - - - +{if $cv.mail == "kolab"} + +{/if} + + + + @@ -154,45 +166,63 @@ - + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - - - + + + - - - - + + + - - {kolabAccount} + +{if $cv.mail == "kolab"} + +{/if} + - - - - + username="OGo" + password="" + database="OGo" + datahost="localhost" /> + @@ -203,23 +233,23 @@ - + - + - + - + - + @@ -228,45 +258,180 @@ - + -
+{/if} +{if $cv.optional.ppd_path_active} + ppd_path="{$cv.optional.ppd_path}" +{/if} +{if $cv.optional.max_ldap_query_time_active} + max_ldap_query_time="{$cv.optional.max_ldap_query_time}" +{/if} +{if $cv.optional.noprimarygroup} + noprimarygroup="true" +{/if} +{if $cv.optional.mailQueueScriptPath_active} + mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}" +{/if} +{if $cv.optional.auto_network_hook_active} + auto_network_hook="{$cv.optional.auto_network_hook} " +{/if} +{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.samba_settings.smbhash}' + > - - +{/if} +{if $cv.optional.notifydir_active } + notifydir="{$cv.optional.notifydir}" +{/if} +{if $cv.base_hook_active} + base_hook="{$cv.base_hook}" +{/if} +{if $cv.generic_settings.wws_ou_active} + winstations="{$cv.generic_settings.wws_ou}" +{/if} +{if $cv.id_settings.idgen_active} + idgen="{$cv.id_settings.idgen}" +{/if} +{if $cv.strict} + strict="yes" +{else} + strict="no" +{/if} +{if $cv.id_settings.minid_active} + minid="{$cv.id_settings.minid}" +{/if} +{if $cv.mail != "disabled"} + mailMethod="{$cv.mail}" +{if $cv.cyrusunixstyle} + cyrusunixstyle="true" +{else} + cyrusunixstyle="false" +{/if} +{if $cv.mail_settings.vacationdir_active} + vacationdir="{$cv.mail_settings.vacationdir}" +{/if} +{/if} +{if $cv.tls} + tls="true" +{/if} +{if $cv.governmentmode} + governmentmode="true" +{else} + governmentmode="false" +{/if} +{if $cv.sambaidmapping} + sambaidmapping="true" +{/if} +{if $cv.account_expiration} + account_expiration="true" +{/if} +{if $cv.samba_settings.samba_sid_active} + SID="{$cv.samba_settings.samba_sid}" +{/if} +{if $cv.samba_settings.samba_rid_active} + RIDBASE="{$cv.samba_settings.samba_rid_active}" +{/if} +{if $cv.generic_settings.snapshot_active} + enable_snapshot="true" +{if $cv.generic_settings.snapshot_base != ""} + snapshot_base="{$cv.generic_settings.snapshot_base}" +{/if} +{if $cv.generic_settings.snapshot_user != ""} + snapshot_user="{$cv.generic_settings.snapshot_user}" +{/if} +{if $cv.generic_settings.snapshot_password != ""} + snapshot_password="{$cv.generic_settings.snapshot_password}" +{/if} +{if $cv.generic_settings.snapshot_server != ""} + snapshot_server="{$cv.generic_settings.snapshot_server}" +{/if} +{/if} +{if $cv.samba_version != 0} + sambaversion="{$cv.samba_version}" +{/if} + config="ou=gosa,ou=configs,ou=systems,{$cv.base}"> - + diff --git a/contrib/gosa.conf.in b/contrib/gosa.conf.in deleted file mode 100644 index 89922723f..000000000 --- a/contrib/gosa.conf.in +++ /dev/null @@ -1,452 +0,0 @@ -{literal}{/literal} - - -
- - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{if $cv.mail == "kolab"} - -{/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{if $cv.mail == "kolab"} - -{/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
-