Reset keys, if empty data is given.

[gosa.git] / gosa-core / contrib / gosa.conf

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 5061a2ec9c1b8cbe6f14e9c8930c7fb4e4449299..5649ea8a082fc1b56be5ecec14613f893a52fd4c 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -57,7 +57,7 @@
       <plugin acl="application" class="applicationManagement" />
       <plugin acl="mimetypes" class="mimetypeManagement" />
       <plugin acl="devices" class="deviceManagement" />
-      <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric,opsi/opsiGeneric" class="systems" />
+      <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric,opsi/opsiGeneric" class="systemManagement" />
       <!-- Use 'lockDn'      for dn
                'lockName'    for name
                'lockType'    for branch/freeze -->
@@ -72,9 +72,8 @@
 
     <!-- Section to enable addon plugins -->
     <section name="Addons">
-      <plugin acl="rsyslog"  class="rsyslog" />
+      <plugin acl="server/rSyslogServer" class="rsyslog" />
     <!--  <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/faxreport:self,faxreport" class="faxreport" />
       <plugin acl="fonreport/fonreport:self,fonreport" class="fonreport" />
@@ -157,7 +156,6 @@
 
   <phonetabs>
     <tab class="phoneGeneric" name="Generic" />
-    <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </phonetabs>
 
   <!-- GOto plugins -->
@@ -183,7 +181,6 @@
      <tab class="termstartup" name="Startup" />
      <tab class="termservice" name="Devices" />
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
-     <!--<tab class="glpiAccount" name="Inventory" /> -->
   </termtabs>
 
   <servtabs>
@@ -193,7 +190,6 @@
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
-     <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </servtabs>
 
   <worktabs>
@@ -204,27 +200,23 @@
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
-     <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </worktabs>
 
   <printtabs>
      <tab class="printgeneric" name="Generic" />
-     <!-- <tab class="glpiPrinterAccount" name="Inventory" /> -->
   </printtabs>
 
   <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" || $cv.mail == "kolab22"}
+{if $cv.mail == "Kolab" || $cv.mail == "Kolab22"}
     <tab class="servkolab" />
 {else}
     <!-- <tab class="servkolab" /> -->
@@ -235,7 +227,6 @@
     <tab class="goKrbServer" />
     <tab class="goFaxServer" />
     <tab class="goFonServer" />
-    <tab class="goGlpiServer" />
     <tab class="goCupsServer" />
     <tab class="goKioskService" />
     <tab class="goTerminalServer" />
@@ -293,7 +284,7 @@
 
   <!-- Connectivity plugins -->
   <connectivity>
-{if $cv.mail == "kolab" || $cv.mail == "kolab22"}
+{if $cv.mail == "Kolab" || $cv.mail == "Kolab22"}
     <tab class='kolabAccount' />
 {else}
 <!-- <tab class='kolabAccount' /> -->
@@ -318,8 +309,8 @@
   <ldiftab>
     <tab class="ldifexport" name="Export" />
     <tab class="xlsexport" name="Excel Export" />
-    <tab class="ldifimport" name="Import" />
-    <tab class="csvimport" name="CSV Import" />
+<!--    <tab class="ldifimport" name="Import" /> -->
+<!--    <tab class="csvimport" name="CSV Import" /> -->
   </ldiftab>
 
   <faipartitiontabs>