X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fcontrib%2Fgosa.conf;h=dcb8abef96f9be0e5b1c4b248860c9bfc8cac326;hb=993bc75ad90bf54d6075bbdd2874076efe3078c2;hp=5fb615491170338dd487a356f2a7ecdb3f681efc;hpb=42886e5cc4e1ec51ecb4faf4c669268040c81f25;p=gosa.git

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 5fb615491..dcb8abef9 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -1,573 +1,609 @@
 {literal}<?xml version="1.0"?>{/literal}
-<conf>
-	<menu>
-		<section name="My account">
-			<plugin acl="users/generic" class="user" icon="personal.png"
-				path="plugins/personal/generic" />
-			<plugin acl="users/posixAccount" class="posixAccount" icon="posix.png"
-				path="plugins/personal/posix" />
-			<plugin acl="users/environment" class="environment" icon="env.png"
-{if $cv.optional.kioskpath_active}
-				kioskpath="{$cv.optional.kioskpath}"
-{/if}
-				path="plugins/personal/environment" />
-			<plugin acl="users/mailAccount" class="mailAccount" icon="email.png"
-				path="plugins/personal/mail" />
-			<plugin acl="users/sambaAccount" class="sambaAccount" icon="samba.png"
-				path="plugins/personal/samba" />
+<conf config_version="{$config_checksum}" >
+
+  <!-- GOsa menu definition **************************************************
+
+       This tag defines the side and icon menu inside the
+       interface. Defining an entry here is no guarantie to get it shown,
+       though. Only entries with matching ACL's get shown.
+
+       There are two types of entries inside of the menu: section and plugin
+
+       Defining a section:
+
+       Open a <section> tag including a "name" attribute. This will show up in
+       the menu as a new section later on. Own entries are not handled via I18N
+       by default. Close the </section> tag after your plugin definitions.
+
+       Defining a plugin:
+
+       Open a <plugin> tag including a "class" attribute. The "class" should be
+       present inside your GOsa setup - the entry will be ignored if it is not.
+
+       Plugins should have an "acl" entry, that allows GOsa to decide wether
+       a user is allowed to see a plugin or not. The "acl" string matches with
+       an ACL definition done inside of GOsa -> ACLs.
+
+       You can override an icon by specifying the "icon" attribute.
+
+       For more information about possible configuration parameters, please take
+       a look at the gosa.conf(5) manual page.
+   -->
+  <menu>
+
+    <!-- Section to enable quick self service shortcuts for the logged in user -->
+    <section name="My account">
+      <plugin acl="users/user:self" class="user" />
+      <plugin acl="users/posixAccount:self"  class="posixAccount" />
+      <plugin acl="users/environment:self" class="environment" {if $cv.optional.kioskpath_active} kioskpath="{$cv.optional.kioskpath}"{/if} />
+      <plugin acl="users/mailAccount:self" class="mailAccount" />
+      <plugin acl="users/sambaAccount:self" class="sambaAccount" />
 {if $cv.use_netatalk}
-			<plugin acl="users/netatalk" class="netatalk" icon="netatalk.png"
-				path="plugins/personal/netatalk" />
+      <plugin acl="users/netatalk:self" class="netatalk" />
 {else}
-<!--
-			<plugin acl="default" class="netatalk" icon="netatalk.png"
-				path="plugins/personal/netatalk" />
--->
-{/if}
-			<plugin acl="users/connectivity" class="connectivity" icon="proxy.png"
-				path="plugins/personal/connectivity" />
-			<plugin acl="users/gofaxAccount" class="gofaxAccount" icon="fax.png"
-				path="plugins/gofax/faxaccount" />
-			<plugin acl="users/phoneAccount" class="phoneAccount" icon="phone.png"
-				path="plugins/gofon/phoneaccount" />
-<!--
-			<plugin acl="users/nagiosAccount" class="nagiosAccount" icon="monitoring.png"
-				path="plugins/personal/nagios" />
--->
-			<plugin acl="users/password" class="password" icon="password.png"
-				path="plugins/personal/password" />
-		</section>
-		
-		<section name="Administration">
-			<plugin acl="users" class="userManagement" icon="user.png"
-				path="plugins/admin/users" />
-			<plugin acl="groups" class="groupManagement" icon="group.png"
-				path="plugins/admin/groups" />
-			<plugin acl="ogroups" class="ogroupManagement" icon="ogroup.png"
-				path="plugins/admin/ogroups" />
-			<plugin acl="department" class="departmentManagement" icon="department.png"
-				path="plugins/admin/departments" />
-			<plugin acl="application" class="applicationManagement"
-				icon="application.png" path="plugins/admin/applications" />
-			<plugin acl="terminal,workstation,server,phone,printer,component,winworkstation" class="systems" icon="system.png"
-				path="plugins/admin/systems" />
+      <!--  <plugin acl="users/netatalk:self" class="netatalk" />  -->
+{/if}
+      <plugin acl="users/connectivity:self" class="connectivity" />
+      <plugin acl="users/gofaxAccount:self" class="gofaxAccount" />
+      <plugin acl="users/phoneAccount:self" class="phoneAccount" />
+      <plugin acl="users/nagiosAccount:self" class="nagiosAccount" />
+      <plugin acl="users/scalixAccount:self" class="scalixAccount" />
+      <plugin acl="users/password:self" class="password" />
+    </section>
+    
+    <!-- Section to enable administrative services -->
+    <section name="Administration">
+      <plugin acl="department" class="departmentManagement" />
+      <plugin acl="users" class="userManagement" />
+      <plugin acl="groups" class="groupManagement" />
+      <plugin acl="ogroups" class="ogroupManagement" />
+      <plugin acl="application" class="applicationManagement" />
 {if $cv.enableMimeType}
-			<plugin acl="mimetypes" class="mimetypeManagement"
-				icon="mimetypes.png" path="plugins/admin/mimetypes" />
+      <plugin acl="mimetypes" class="mimetypeManagement" />
 {else}
-<!--
-			<plugin acl="mimetype" class="mimetypeManagement"
-				icon="mimetypes.png" path="plugins/admin/mimetypes" />
--->
+      <!--  <plugin acl="mimetypes"  class="mimetypeManagement" /> -->
 {/if}
-			<plugin acl="devices" class="deviceManagement"
-				icon="devices.png" path="plugins/admin/devices" />
-
-			<!-- Use 'lock_dn'      for dn
-				'lock_name'    for name
-				'lock_type'    for branch/freeze -->
+      <plugin acl="devices" class="deviceManagement" />
+      <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric" class="systems" />
+      <!-- Use 'lock_dn'      for dn
+        'lock_name'    for name
+        'lock_type'    for branch/freeze -->
 {if $cv.enableFAI_management}
-			<plugin acl="fai" class="faiManagement" icon="fai.png" 
-				path="plugins/admin/fai" />
-{else}
-<!--
-			<plugin acl="FAIclass" class="faiManagement" icon="fai.png" 
-				path="plugins/admin/fai" />
--->
-{/if}
-			<plugin acl="gofaxlist" class="blocklist" icon="blocklists.png"
-				path="plugins/gofax/blocklists" />
-			<plugin acl="gofonmacro" class="goFonMacro" icon="macros.png"
-				path="plugins/gofon/macro" />
-			<plugin acl="gofonconference" 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">
-			<plugin acl="addressbook" class="addressbook" icon="addressbook.png"
-				path="plugins/addons/addressbook" />
-			<plugin acl="faxreport" class="faxreport" icon="reports.png"
-				path="plugins/gofax/faxreports" />
-			<plugin acl="fonreport" class="fonreport" icon="phonereport.png"
-				path="plugins/gofon/fonreports" />
-			<plugin acl="logview" class="logview" icon="logview.png"
-				path="plugins/addons/logview" />
-			<plugin acl="mailqueue" class="mailqueue" icon="mailqueue.png"
-				path="plugins/addons/mailqueue" />
-			<plugin acl="ldapmanager" class="ldif" icon="ldif.png"
-				path="plugins/addons/ldapmanager" />
-{if $cv.optional.gotomasses_active}
-			<plugin acl="gotomasses" class="gotomasses" icon="system.png"
-				path="plugins/addons/goto" />
+      <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile" class="faiManagement" />
 {else}
-<!--
-			<plugin acl="gotomasses" class="gotomasses" icon="system.png"
-				path="plugins/addons/gotomasses" />
--->
-{/if}
-<!--
-			<plugin acl="all" class="bugsubmitter" icon="bugsubmitter.png"
-				path="plugins/addons/bugsubmitter" />
--->
-		</section>
-	</menu>
-
-	<aclroletab>
-		<tab class="aclRole" name="ACL Role" />
-	</aclroletab>
-
-	<usertabs>
-		<tab class="user" name="Generic" />
-		<tab class="posixAccount" name="Unix" />
-		<tab class="environment" name="Environment" />
-		<tab class="mailAccount" name="Mail" />
-		<tab class="sambaAccount" name="Samba" />
-{if $cv.use_netatalk}
-		<tab class="netatalk" name="Netatalk" />
-{else}
-<!--
-		<tab class="netatalk" name="Netatalk" />
--->
-{/if}
-		<tab class="connectivity" name="Connectivity" />
-		<tab class="gofaxAccount" name="Fax" />
-		<tab class="phoneAccount" name="Phone" />
-<!--
-		<tab class="scalixAccount" name="Scalix" />
--->
-<!--            
-		<tab class="nagiosAccount" name="Nagios" /> 
--->
-	</usertabs>
-
-	<faxblocktabs>
-		<tab class="blocklistGeneric" name="Generic" />
-	</faxblocktabs>
-
-	<mimetabs>
-		<tab class="mimetype" name="Generic" />
-	</mimetabs>
-
-	<devicetabs>
-		<tab class="deviceGeneric" name="Generic" />
-	</devicetabs>
-
-
-	<grouptabs>
-		<tab class="group" name="Generic" />
-		<tab class="environment" name="Environment" />
-		<tab class="appgroup" name="Applications" />
-		<tab class="mailgroup" name="Mail" />
-	</grouptabs>
-
-	<appstabs>
-		<tab class="application" name="Generic" />
-		<tab class="applicationParameters" name="Options" />
-	</appstabs>
-
-	<conferencetabs>
-		<tab class="conference" name="Generic" />
-	</conferencetabs>
-
-	<macrotabs>
-		<tab class="macro" name="Generic" />
-		<tab class="macroParameter" name="Parameter" />
-	</macrotabs>
-
-	<termtabs>
-		<tab class="termgeneric" name="Generic" />
-		<tab class="termstartup" name="Startup" />
-		<tab class="termservice" name="Devices" />
-		<tab class="printgeneric" name="Printer" />
-		<tab class="terminfo" name="Information" 
-			snmpcommunity="{$cv.optional.snmpcommunity}" />
-		<tab class="glpiAccount" name="Inventory" />
-	</termtabs>
-
-	<servtabs>
-		<tab class="servgeneric" name="Generic" />
-		<tab class="workstartup" name="Startup" />
-		<tab class="ServerService" name="Services" />
+      <!--  <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile" class="faiManagement" /> -->
+{/if}
+      <plugin acl="gofaxlist" class="blocklist" />
+      <plugin acl="gofonmacro" class="goFonMacro" />
+      <plugin acl="gofonconference" class="phoneConferenceManagment" />
+      <plugin acl="acl"  class="aclManagement" />
+      <plugin acl="sudo" class="sudoManagement" />
+    </section>
+
+    <!-- Section to enable addon plugins -->
+    <section name="Addons">
+    <!--  <plugin acl="server/servservrepository,server/dakrepository,server/dakkeyring,server/dakqueue" class="dak_tabs" path="plugins/addons/dak" /> -->
+      <plugin acl="addressbook" class="addressbook" />
+      <plugin acl="mailqueue" class="mailqueue" />
+      <plugin acl="faxreport" class="faxreport" />
+      <plugin acl="fonreport" class="fonreport" />
+      <plugin acl="logview"  class="logview" />
+      <plugin acl="gotomasses" class="gotomasses" />
+      <plugin acl="ldapmanager" class="ldif" />
+    </section>
+  </menu>
+
+
+
+  <!-- Tab definitions *******************************************************
+
+       Tab definitions define the sub plugins which get included for certain
+       tabbed dialogs. If you change something here, never (!) remove the
+       primary (the first) "tab" tag which is defined. Most tabbed dialogs
+       need a primary plugin.
+
+       "*tab" should be looked for by a defined plugin. This one will take
+       every "tab" defined "class" and will show it inside of a tabbed dialog
+       with the header defined in "name".
+   -->
+
+  <!-- ACL dialog -->
+  <aclroletab>
+    <tab class="aclRole" name="ACL Role" />
+  </aclroletab>
+
+  <!-- User dialog -->
+  <usertabs>
+     <tab class="user" name="Generic" />
+     <tab class="posixAccount" name="Unix" />
+     <tab class="environment" name="Environment" />
+     <tab class="mailAccount" name="Mail" />
+     <tab class="sambaAccount" name="Samba" />
+{if $cv.use_netatalk}     <tab class="netatalk" name="Netatalk" /> {else}<!-- <tab class="netatalk" name="Netatalk" /> --> {/if}
+     <tab class="connectivity" name="Connectivity" />
+     <tab class="gofaxAccount" name="Fax" />
+     <tab class="phoneAccount" name="Phone" />
+     <tab class="scalixAccount" name="Scalix" />
+     <tab class="nagiosAccount" name="Nagios" /> 
+   </usertabs>
+
+  <!-- Group dialog -->
+  <grouptabs>
+    <tab class="group" name="Generic" />
+    <tab class="environment" name="Environment" />
+    <tab class="appgroup" name="Applications" />
+    <tab class="mailgroup" name="Mail" />
+  </grouptabs>
+
+  <!-- Sudo dialog -->
+  <sudotabs>
+    <tab class="sudo" name="Generic" />
+    <tab class="sudoOption" name="Options" />
+  </sudotabs>
+
+  <!-- GOfax plugins -->
+  <faxblocktabs>
+    <tab class="blocklistGeneric" name="Generic" />
+  </faxblocktabs>
+
+  <!-- GOfon plugins -->
+  <conferencetabs>
+    <tab class="conference" name="Generic" />
+  </conferencetabs>
+
+  <macrotabs>
+    <tab class="macro" name="Generic" />
+    <tab class="macroParameter" name="Parameter" />
+  </macrotabs>
+
+  <phonetabs>
+    <tab class="phoneGeneric" name="Generic" />
+    <!-- <tab class="glpiAccount" name="Inventory" /> -->
+  </phonetabs>
+
+  <!-- GOto plugins -->
+  <appstabs>
+    <tab class="application" name="Generic" />
+    <tab class="applicationParameters" name="Options" />
+  </appstabs>
+
+  <mimetabs>
+    <tab class="mimetype" name="Generic" />
+  </mimetabs>
+
+  <devicetabs>
+    <tab class="deviceGeneric" name="Generic" />
+  </devicetabs>
+
+  <arpnewdevicetabs>
+    <tab class="ArpNewDevice" name="Generic" />
+  </arpnewdevicetabs>
+
+  <termtabs>
+     <tab class="termgeneric" name="Generic" />
+     <tab class="termstartup" name="Startup" />
+     <tab class="termservice" name="Devices" />
+     <tab class="printgeneric" name="Printer" />
+     <tab class="terminfo" name="Information" snmpcommunity="{$cv.optional.snmpcommunity}" />
+     <!--<tab class="glpiAccount" name="Inventory" /> -->
+  </termtabs>
+
+  <servtabs>
+     <tab class="servgeneric" name="Generic" />
+     <tab class="workstartup" name="Startup" />
+     <tab class="ServerService" name="Services" />
 {if $cv.enableFAI_management}
-	    <tab class="faiSummaryTab" name="FAI summary" />
+     <tab class="faiSummaryTab" name="Deployment summary" />
+     <tab class="goto_log_view" name="Installation logs" />
 {else}
-<!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
-{/if}
-		<tab class="terminfo" name="Information" 
-			snmpcommunity="{$cv.optional.snmpcommunity}" />
-		<tab class="glpiAccount" name="Inventory" />
-	</servtabs>
-
-	<worktabs>
-		<tab class="workgeneric" name="Generic" />
-		<tab class="workstartup" name="Startup" />
-		<tab class="workservice" name="Devices" />
-		<tab class="printgeneric" name="Printer" />
-		<tab class="terminfo" name="Information" 
-			snmpcommunity="{$cv.optional.snmpcommunity}" />
+     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
+     <!-- <tab class="goto_log_view" name="Installation logs" /> -->
+{/if}
+     <tab class="terminfo" name="Information" snmpcommunity="{$cv.optional.snmpcommunity}" />
+     <!-- <tab class="glpiAccount" name="Inventory" /> -->
+  </servtabs>
+
+  <worktabs>
+     <tab class="workgeneric" name="Generic" />
+     <tab class="workstartup" name="Startup" />
+     <tab class="workservice" name="Devices" />
+     <tab class="printgeneric" name="Printer" />
+     <tab class="terminfo" name="Information" snmpcommunity="{$cv.optional.snmpcommunity}" />
 {if $cv.enableFAI_management}
-	    <tab class="faiSummaryTab" name="FAI summary" />
+     <tab class="faiSummaryTab" name="Deployment summary" />
+     <tab class="goto_log_view" name="Installation logs" />
 {else}
-<!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
+     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
+     <!-- <tab class="goto_log_view" name="Installation logs" /> -->
 {/if}
-		<tab class="glpiAccount" name="Inventory" />
-	</worktabs>
+     <!-- <tab class="glpiAccount" name="Inventory" /> -->
+  </worktabs>
 
-	<printtabs>
-		<tab class="printgeneric" name="Generic" />
-		<tab class="glpiPrinterAccount" name="Inventory" />
-	</printtabs>
+  <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>
 
-	<componenttabs>
-		<tab class="componentGeneric" name="Generic" />
-		<tab class="glpiAccount" name="Inventory" />
-	</componenttabs>
+  <wintabs>
+     <tab class="wingeneric" name="Generic" />
+     <!-- <tab class="glpiAccount" name="Inventory" /> -->
+  </wintabs>
 
-	<wintabs>
-		<tab class="wingeneric" name="Generic" />
-		<tab class="glpiAccount" name="Inventory" />
-	</wintabs>
-
-	<serverservice>
-		<tab class="goMailServer" />
+  <serverservice>
+    <tab class="goMailServer" />
 {if $cv.mail == "kolab"}
-		<tab class="servkolab" />
-{/if}
-		<tab class="goNtpServer" />
-		<tab class="servrepository" />
-		<tab class="goImapServer" />
-		<tab class="goKrbServer" />
-		<tab class="goFaxServer" />
-		<tab class="goFonServer" />
-		<tab class="goLogDBServer" />
-		<tab class="goGlpiServer" />
-		<tab class="goCupsServer" />
-		<tab class="goKioskService" />
-		<tab class="goSyslogServer" />
-		<tab class="goTerminalServer" />
-		<tab class="goLdapServer" />
-		<tab class="goShareServer" />
+    <tab class="servkolab" />
+{/if}
+    <tab class="goNtpServer" />
+    <tab class="servrepository" />
+    <tab class="goImapServer" />
+    <tab class="goKrbServer" />
+    <tab class="goFaxServer" />
+    <tab class="goFonServer" />
+    <tab class="goLogDBServer" />
+    <tab class="goGlpiServer" />
+    <tab class="goCupsServer" />
+    <tab class="goKioskService" />
+    <tab class="goSyslogServer" />
+    <tab class="goTerminalServer" />
+    <tab class="goLdapServer" />
+    <tab class="goShareServer" />
 {if $cv.generic_settings.enableDHCP}
-		<tab class="servdhcp" />
+    <tab class="servdhcp" />
 {/if}
 {if $cv.generic_settings.enableDNS}
-		<tab class="servdns" />
+    <tab class="servdns" />
+{/if}
+    <tab class="gosaLogServer" />
+  </serverservice>
+
+  <!-- Department plugin -->
+  <deptabs>
+    <tab class="department" name="Generic" />
+  </deptabs>
+
+  <organization_tabs>
+    <tab class="organization" name="Generic" />
+  </organization_tabs>
+
+  <locality_tabs>
+    <tab class="locality" name="Generic" />
+  </locality_tabs>
+
+  <country_tabs>
+    <tab class="country" name="Generic" />
+  </country_tabs>
+
+  <dcobject_tabs>
+    <tab class="dcObject" name="Generic" />
+  </dcobject_tabs>
+
+  <ogrouptabs>
+    <tab class="ogroup" name="Generic" />
+  </ogrouptabs>
+
+  <!-- Debian archive management plugin -->
+  <!--
+  <dak_tabs>
+    <tab class="dakrepository" name="Repository" />
+    <tab class="dakqueue" name="Queue" />
+    <tab class="dakkeyring" name="Key ring" />
+  </dak_tabs>
+  -->
+
+  <!-- Connectivity plugins -->
+  <connectivity>
+{if $cv.mail == "kolab"}
+    <tab class='kolabAccount' /> 
+{/if}
+    <tab class="proxyAccount" />
+    <tab class="pureftpdAccount" />
+    <tab class="webdavAccount" />
+    <tab class="phpgwAccount" />
+    <tab class="intranetAccount" />
+    <!--
+    <tab class="opengwAccount"
+      username="OGo"
+      password=""
+      database="OGo"
+      datahost="localhost" />
+    -->
+    <tab class="pptpAccount" /> 
+    <tab class="phpscheduleitAccount" /> 
+        <tab class="oxchangeAccount" />
+  </connectivity>
+
+  <ldiftab>
+    <tab class="ldifexport" name="Export" />
+    <tab class="xlsexport" name="Excel Export" />
+    <tab class="ldifimport" name="Import" />
+    <tab class="csvimport" name="CSV Import" />
+  </ldiftab>
+
+  <!-- FAI plugins -->
+{if $cv.enableFAI_management}
+  <faipartitiontabs>
+    <tab class="faiPartitionTable" name="Partitions" />
+  </faipartitiontabs>
+
+  <faiscripttabs>
+    <tab class="faiScript" name="Script" />
+  </faiscripttabs>
+
+  <faihooktabs>
+    <tab class="faiHook" name="Hooks" />
+  </faihooktabs>
+
+  <faivariabletabs>
+    <tab class="faiVariable" name="Variables" />
+  </faivariabletabs>
+
+  <faitemplatetabs>
+    <tab class="faiTemplate" name="Templates" />
+  </faitemplatetabs>
+
+  <faiprofiletabs>
+    <tab class="faiProfile" name="Profiles" />
+    <tab class="faiSummaryTab" name="Summary" />
+  </faiprofiletabs>
+
+  <faipackagetabs>
+    <tab class="faiPackage" name="Packages" />
+  </faipackagetabs>
+{else}
+  <!-- 
+  <faipartitiontabs>
+    <tab class="faiPartitionTable" name="Partitions" />
+  </faipartitiontabs>
+
+  <faiscripttabs>
+    <tab class="faiScript" name="Script" />
+  </faiscripttabs>
+
+  <faihooktabs>
+    <tab class="faiHook" name="Hooks" />
+  </faihooktabs>
+
+  <faivariabletabs>
+    <tab class="faiVariable" name="Variables" />
+  </faivariabletabs>
+
+  <faitemplatetabs>
+    <tab class="faiTemplate" name="Templates" />
+  </faitemplatetabs>
+
+  <faiprofiletabs>
+    <tab class="faiProfile" name="Profiles" />
+    <tab class="faiSummaryTab" name="Summary" />
+  </faiprofiletabs>
+
+  <faipackagetabs>
+    <tab class="faiPackage" name="Packages" />
+  </faipackagetabs>
+  -->
 {/if}
-		<tab class="gosaLogServer" />
-	</serverservice>
 
-	<deptabs>
-		<tab class="department" name="Generic" />
-	</deptabs>
 
-	<ogrouptabs>
-		<tab class="ogroup" name="Generic" />
-	</ogrouptabs>
+  <!-- Logging plugin -->
+  <logtabs>
+      <tab class="logview" name="System logs" />
+      <tab class="gosa_logview" name="GOsa logs" />
+  </logtabs>
+  
 
-	<connectivity>
-{if $cv.mail == "kolab"}
-		<tab class='kolabAccount' /> 
-{/if}
-		<tab class="proxyAccount" />
-		<tab class="pureftpdAccount" />
-		<tab class="webdavAccount" />
-		<tab class="phpgwAccount" />
-		<tab class="intranetAccount" />
-		<tab class="opengwAccount"
-			username="OGo"
-			password=""
-			database="OGo"
-			datahost="localhost" />
-<!--	
-		<tab class="pptpAccount" /> 
-		<tab class="phpscheduleitAccount" /> 
--->
-	</connectivity>
-
-	<ldiftab>
-		<tab class="ldifexport" name="Export" />
-		<tab class="xlsexport" name="Excel Export" />
-		<tab class="ldifimport" name="Import" />
-		<tab class="csvimport" name="CSV Import" />
-	</ldiftab>
-
-        <arpnewdevicetabs>
-                <tab class="ArpNewDevice" name="Generic" />
-        </arpnewdevicetabs>
+  <!-- Main section **********************************************************
 
-{if $cv.enableFAI_management}
-	<faipartitiontabs>
-		<tab class="faiPartitionTable" name="Partitions" />
-	</faipartitiontabs>
-
-	<faiscripttabs>
-		<tab class="faiScript" name="Script" />
-	</faiscripttabs>
-
-	<faihooktabs>
-		<tab class="faiHook" name="Hooks" />
-	</faihooktabs>
-
-	<faivariabletabs>
-		<tab class="faiVariable" name="Variables" />
-	</faivariabletabs>
-
-	<faitemplatetabs>
-		<tab class="faiTemplate" name="Templates" />
-	</faitemplatetabs>
-
-	<faiprofiletabs>
-		<tab class="faiProfile" name="Profiles" />
-		<tab class="faiSummaryTab" name="Summary" />
-	</faiprofiletabs>
-
-	<faipackagetabs>
-		<tab class="faiPackage" name="Packages" />
-	</faipackagetabs>
-{else}
-<!-- 
-	<faipartitiontabs>
-		<tab class="faiPartitionTable" name="Partitions" />
-	</faipartitiontabs>
-
-	<faiscripttabs>
-		<tab class="faiScript" name="Script" />
-	</faiscripttabs>
-
-	<faihooktabs>
-		<tab class="faiHook" name="Hooks" />
-	</faihooktabs>
-
-	<faivariabletabs>
-		<tab class="faiVariable" name="Variables" />
-	</faivariabletabs>
-
-	<faitemplatetabs>
-		<tab class="faiTemplate" name="Templates" />
-	</faitemplatetabs>
-
-	<faiprofiletabs>
-		<tab class="faiProfile" name="Profiles" />
-		<tab class="faiSummaryTab" name="Summary" />
-	</faiprofiletabs>
-
-	<faipackagetabs>
-		<tab class="faiPackage" name="Packages" />
-	</faipackagetabs>
--->
-{/if}
-
-	<logtabs>
-			<tab class="logview" name="System logs" />
-			<tab class="gosa_logview" name="GOsa logs" />
-	</logtabs>
-	
-	<main default="{$cv.location}"
+       The main section defines global settings, which might be overridden by
+       each location definition inside.
+
+       For more information about the configuration parameters, take a look at
+       the gosa.conf(5) manual page.
+
+  -->
+  <main default="{$cv.location}"
 {if $cv.optional.list_summary}
-		list_summary="true"
+        list_summary="true"
 {else}
-		list_summary="false"
+        list_summary="false"
 {/if}
 {if $cv.pwd_rules.pwminlen_active}
-		pwminlen="{$cv.pwd_rules.pwminlen}"
+        pwminlen="{$cv.pwd_rules.pwminlen}"
 {/if}
 {if $cv.pwd_rules.pwdiffer_active}
-		pwdiffer="{$cv.pwd_rules.pwdiffer}"
+        pwdiffer="{$cv.pwd_rules.pwdiffer}"
 {/if}
 {if $cv.pwd_rules.externalpwdhook_active}
-		externalpwdhook="{$cv.pwd_rules.externalpwdhook}"
+        externalpwdhook="{$cv.pwd_rules.externalpwdhook}"
 {/if}
 {if $cv.errorlvl}
-		displayerrors="true"
+        displayerrors="true"
 {else}
-		displayerrors="false"
+        displayerrors="false"
 {/if}
 {if $cv.enable_schema_check}
-		schema_check="true"
+        schema_check="true"
 {else}
-		schema_check="false"
+        schema_check="false"
 {/if}
 {if $cv.generic_settings.enableCopyPaste}
-		enableCopyPaste="true"
+        enableCopyPaste="true"
 {else}
-		enableCopyPaste="false"
+        enableCopyPaste="false"
 {/if}
 {if $cv.optional.forceglobals}
-		forceglobals="true"
+        forceglobals="true"
 {else}
-		forceglobals="false"
+        forceglobals="false"
 {/if}
 {if $cv.optional.forcessl}
-		forcessl="true"
+        forcessl="true"
 {else}
-		forcessl="false"
+        forcessl="false"
 {/if}
 {if $cv.optional.ldapstats}
-		ldapstats="true"
+        ldapstats="true"
 {else}
-		ldapstats="false"
+        ldapstats="false"
 {/if}
 {if $cv.optional.warnssl}
-		warnssl="true"
+        warnssl="true"
 {else}
-		warnssl="false"
+        warnssl="false"
 {/if}
 {if $cv.optional.ppd_path_active}
-		ppd_path="{$cv.optional.ppd_path}"
+       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 $cv.optional.max_ldap_query_time_active}  
+       max_ldap_query_time="{$cv.optional.max_ldap_query_time}"
 {/if}
 {if $cv.optional.noprimarygroup}
-		noprimarygroup="true"
+       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} "
+       mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
 {/if}
 {if $cv.optional.user_filter_cookie}
-		save_filter="true"
+       save_filter="true"
 {else}
-		save_filter="false"
+       save_filter="false"
 {/if}
 {if $cv.compressed}
-		compressed="true"
+       compressed="true"
 {else}
-		compressed="false"
+       compressed="false"
 {/if}
 {if $cv.optional.uniq_identifier_active }
-		uniq_identifier="{$cv.optional.uniq_identifier}"
+       uniq_identifier="{$cv.optional.uniq_identifier}"
 {else}
-		uniq_identifier=""
-{/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}'
-		>
-
-		<location name="{$cv.location}"
-			hash="{$cv.encryption}"
-			dnmode="{$cv.peopledn}"
-			server="{$cv.connection}"
-			people="{$cv.peopleou}"
-			groups="{$cv.groupou}"
-			gidbase="{$cv.uidbase}"
-			uidbase="{$cv.uidbase}"
+       uniq_identifier=""
+{/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}'
+    >
+
+    <!-- Location definition -->
+    <location name="{$cv.location}"
+              hash="{$cv.encryption}"
+              dnmode="{$cv.peopledn}"
+              server="{$cv.connection}"
+              people="{$cv.peopleou}"
+              groups="{$cv.groupou}"
+              gidbase="{$cv.uidbase}"
+              uidbase="{$cv.uidbase}"
+              logging="{$cv.generic_settings.logging}"
+{if $cv.optional.sudoou_active}
+              sudoou="{$cv.optional.sudoou}"
+{/if}
 {if $cv.optional.login_attribute}
-			login_attribute="{$cv.optional.login_attribute}"
+              login_attribute="{$cv.optional.login_attribute}"
 {else}
-			login_attribute="uid"
+              login_attribute="uid"
 {/if}
 {if $cv.timezone}
-			timezone="{$cv.timezone}"
+              timezone="{$cv.timezone}"
 {/if}
 {if $cv.optional.strict_units}
-			strict_units="true"
+              strict_units="true"
 {else}
-			strict_units="false"
+              strict_units="false"
 {/if}
 {if $cv.krbsasl}
-			krbsasl="true"
+              krbsasl="true"
 {else}
-			krbsasl="false"
+              krbsasl="false"
 {/if}
 {if $cv.rfc2307bis}
-			rfc2307bis="true"
+              rfc2307bis="true"
 {else}
-			rfc2307bis="false"
+              rfc2307bis="false"
 {/if}
 {if $cv.include_personal_title}
-			include_personal_title="true"
+              include_personal_title="true"
 {else}
-			include_personal_title="false"
-{/if}
-{if $cv.optional.notifydir_active }
-			notifydir="{$cv.optional.notifydir}"
+              include_personal_title="false"
 {/if}
 {if $cv.base_hook_active}
-			base_hook="{$cv.base_hook}"
+              base_hook="{$cv.base_hook}"
 {/if}
 {if $cv.generic_settings.wws_ou_active}
-			winstations="{$cv.generic_settings.wws_ou}"
+              winstations="{$cv.generic_settings.wws_ou}"
 {/if}
 {if $cv.id_settings.idgen_active}
-			idgen="{$cv.id_settings.idgen}"
+              idgen="{$cv.id_settings.idgen}"
 {/if}
 {if $cv.strict}
-			strict="yes"
+              strict="yes"
 {else}
-			strict="no"
+              strict="no"
 {/if}
 {if $cv.id_settings.minid_active}
-			minid="{$cv.id_settings.minid}"
+              minid="{$cv.id_settings.minid}"
 {/if}
 {if $cv.mail != "disabled"}
-			mailMethod="{$cv.mail}"
+              mailMethod="{$cv.mail}"
 {if $cv.cyrusunixstyle}
-			cyrusunixstyle="true"
+              cyrusunixstyle="true"
 {else}
-			cyrusunixstyle="false"
+              cyrusunixstyle="false"
 {/if}
-			mail_uattrib="{$cv.mail_attrib}"
+              mail_uattrib="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
-			vacationdir="{$cv.mail_settings.vacationdir}"
+              vacationdir="{$cv.mail_settings.vacationdir}"
 {/if}
 {/if}
 {if $cv.tls}
-			tls="true"
+              tls="true"
 {/if}
 {if $cv.governmentmode}
-			governmentmode="true"
+              governmentmode="true"
 {else}
-			governmentmode="false"
+              governmentmode="false"
 {/if}
 {if $cv.sambaidmapping}
-			sambaidmapping="true"
+              sambaidmapping="true"
 {/if}
 {if $cv.account_expiration}
-			account_expiration="true"
+              account_expiration="true"
 {/if}
 {if $cv.samba_settings.samba_sid_active}
-			SID="{$cv.samba_settings.samba_sid}"
+              SID="{$cv.samba_settings.samba_sid}"
 {/if}
 {if $cv.samba_settings.samba_rid_active}
-			RIDBASE="{$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_active}  
+              enable_snapshot="true"
 {if $cv.generic_settings.snapshot_base != ""}
-			snapshot_base="{$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}"
+              snapshot_user="{$cv.generic_settings.snapshot_user}"
 {/if}
 {if $cv.generic_settings.snapshot_password != ""}
-			snapshot_password="{$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}"
+              snapshot_server="{$cv.generic_settings.snapshot_server}"
 {/if}
 {/if}
 {if $cv.samba_version != 0}
-			sambaversion="{$cv.samba_version}"
+              sambaversion="{$cv.samba_version}"
 {/if}
-			config="ou=gosa,ou=configs,ou=systems,{$cv.base}">
+              config="ou=gosa,ou=configs,ou=systems,{$cv.base}">
+
+              <referral url="{$cv.connection}/{$cv.base}"
+                       admin="{$cv.admin}"
+                       password="{$cv.password}" />
 
-			<referral url="{$cv.connection}/{$cv.base}"
-				admin="{$cv.admin}"
-				password="{$cv.password}" />
-		</location>
-	</main>
+    </location>
+  </main>
 </conf>