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 693c1daf5fa6b71c4ec8a7c485e4abc78c08f09d..5649ea8a082fc1b56be5ecec14613f893a52fd4c 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -46,7 +46,7 @@
       <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" />
@@ -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,12 +72,11 @@
 
     <!-- Section to enable addon plugins -->
     <section name="Addons">
+      <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" />
-      <plugin acl="logview"  class="logview" />
       <plugin acl="gotomasses" class="gotomasses" />
       <plugin acl="ldapmanager" class="ldif" />
     </section>
@@ -98,6 +97,10 @@
    -->
 
   <!-- ACL dialog -->
+  <acltab>
+    <tab class="acl" name="ACL" />
+  </acltab>
+
   <aclroletab>
     <tab class="aclRole" name="ACL Role" />
   </aclroletab>
@@ -153,7 +156,6 @@
 
   <phonetabs>
     <tab class="phoneGeneric" name="Generic" />
-    <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </phonetabs>
 
   <!-- GOto plugins -->
@@ -179,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>
@@ -189,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>
@@ -200,28 +200,26 @@
      <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"}
+{if $cv.mail == "Kolab" || $cv.mail == "Kolab22"}
     <tab class="servkolab" />
+{else}
+    <!-- <tab class="servkolab" /> -->
 {/if}
     <tab class="goNtpServer" />
     <tab class="servrepository" />
@@ -229,11 +227,8 @@
     <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" />
@@ -241,7 +236,7 @@
     <tab class="govirusserver" />
     <tab class="servdhcp" />
     <tab class="servdns" />
-    <tab class="gosaLogServer" />
+    <tab class="rSyslogServer" />
   </serverservice>
 
   <!-- Department plugin -->
@@ -289,12 +284,10 @@
 
   <!-- Connectivity plugins -->
   <connectivity>
-{if $cv.mail == "kolab"}
+{if $cv.mail == "Kolab" || $cv.mail == "Kolab22"}
     <tab class='kolabAccount' />
 {else}
-<!--
-    <tab class='kolabAccount' />
--->
+<!-- <tab class='kolabAccount' /> -->
 {/if}
     <tab class="proxyAccount" />
     <tab class="pureftpdAccount" />
@@ -316,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>
@@ -361,12 +354,10 @@
     <tab class="licenseByProduct" name="Usage"/>
   </opsiprodconfig>
 
-  <!-- Logging plugin -->
-  <logtabs>
-      <tab class="logview" name="System logs" />
-      <tab class="gosa_logview" name="GOsa logs" />
-  </logtabs>
-  
+  <!-- rSyslog plugin -->
+  <rsyslogtabs>
+      <tab class="rsyslog" name="System logs" />
+  </rsyslogtabs>
 
   <!-- Main section **********************************************************
 
@@ -378,6 +369,11 @@
 
   -->
   <main default="{$cv.location}"
+{if $cv.generic_settings.logging}
+        logging="true"
+{else}
+        logging="false"
+{/if}
 {if $cv.optional.list_summary}
         listSummary="true"
 {else}
@@ -450,7 +446,7 @@
 {else}
         sendCompressedOutput="false"
 {/if}
-{if $cv.optional.uniq_identifier_active }
+{if $cv.optional.uniq_identifier_active}
         modificationDetectionAttribute="{$cv.optional.uniq_identifier}"
 {else}
         modificationDetectionAttribute=""
@@ -471,7 +467,6 @@
               groupRDN="{$cv.groupou}"
               gidNumberBase="{$cv.uidbase}"
               uidNumberBase="{$cv.uidbase}"
-              logging="{$cv.generic_settings.logging}"
 {if $cv.optional.sudoou_active}
               sudoRDN="{$cv.optional.sudoou}"
 {/if}