diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 37b58a3791c9f008cc4ddd4a695bffd02384619b..a5287ab499ee761a21f48c0216106eca7dfb2695 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
<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" />
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">
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>
+ <aclroletab>
+ <tab class="aclRole" name="ACL Role" />
+ </aclroletab>
+
<usertabs>
<tab class="user" name="Generic" />
<tab class="posixAccount" name="Unix" />
<tab class="termservice" name="Devices" />
<tab class="printgeneric" name="Printer" />
<tab class="terminfo" name="Information" />
+ <tab class="glpiAccount" name="Inventory" />
</termtabs>
<servtabs>
<tab class="serverService" name="Services" />
<tab class="faiSummaryTab" name="FAI summary" />
<tab class="terminfo" name="Information" />
+ <tab class="glpiAccount" name="Inventory" />
</servtabs>
<worktabs>
<tab class="printgeneric" name="Printer" />
<tab class="terminfo" name="Information" />
<tab class="faiSummaryTab" name="FAI summary" />
+ <tab class="glpiAccount" name="Inventory" />
</worktabs>
<printtabs>
<tab class="printgeneric" name="Generic" />
+ <tab class="glpiPrinterAccount" name="Inventory" />
</printtabs>
<phonetabs>
<tab class="phonegeneric" name="Generic" />
+ <tab class="glpiAccount" name="Inventory" />
</phonetabs>
+ <componenttabs>
+ <tab class="componentgeneric" name="Generic" />
+ <tab class="glpiAccount" name="Inventory" />
+ </componenttabs>
+
+ <wintabs>
+ <tab class="wingeneric" name="Generic" />
+ <tab class="glpiAccount" name="Inventory" />
+ </wintabs>
+
<serverservice>
<tab class="goMailServer" />
{if $cv.mail == "kolab"}
<tab class="goTerminalServer" />
<tab class="goLdapServer" />
<tab class="goShareServer" />
+ <tab class="gosaLogServer" />
</serverservice>
- <componenttabs>
- <tab class="componentgeneric" name="Generic" />
- </componenttabs>
-
- <wintabs>
- <tab class="wingeneric" name="Generic" />
- </wintabs>
-
<deptabs>
<tab class="department" name="Generic" />
</deptabs>
<!--
<tab class="pptpAccount" />
<tab class="phpscheduleitAccount" />
- <tab class="glpiAccount" />
-->
+ <tab class="glpiAccount" />
</connectivity>
<ldiftab>
{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"
{else}
forcessl="false"
{/if}
+{if $cv.optional.ldapstats}
+ ldapstats="true"
+{else}
+ ldapstats="false"
+{/if}
{if $cv.optional.warnssl}
warnssl="true"
{else}
{if $cv.optional.auto_network_hook_active}
auto_network_hook="{$cv.optional.auto_network_hook} "
{/if}
-{if $cv.force_global_lang}
- lang="{$cv.lang}"
+{if $cv.optional.strict_units}
+ strict_units="true"
{else}
- lang=""
+ 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}'
>
<location name="{$cv.location}"
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}
{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}"
{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}