Updated listing table summary

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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 3203749495bba59a2cb924373897265f8eeb4cc0..a57f6c5c3bf8d2f76451983d85e11a10b6e2ce8c 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,12 @@
 
     <!-- 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 +98,10 @@
    -->
 
   <!-- ACL dialog -->
+  <acltab>
+    <tab class="acl" name="ACL" />
+  </acltab>
+
   <aclroletab>
     <tab class="aclRole" name="ACL Role" />
   </aclroletab>
@@ -220,8 +224,10 @@
 
   <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 +235,9 @@
     <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 +245,7 @@
     <tab class="govirusserver" />
     <tab class="servdhcp" />
     <tab class="servdns" />
-    <tab class="gosaLogServer" />
+    <tab class="rSyslogServer" />
   </serverservice>
 
   <!-- Department plugin -->
@@ -265,6 +269,10 @@
     <tab class="dcObject" name="Generic" />
   </dcobject_tabs>
 
+  <domain_tabs>
+    <tab class="domain" name="Generic" />
+  </domain_tabs>
+
   <!-- Role tabs -->
   <roletabs>
     <tab class="roleGeneric" name="Generic"/>
@@ -285,12 +293,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" />
@@ -357,12 +363,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 **********************************************************
 
@@ -374,6 +378,11 @@
 
   -->
   <main default="{$cv.location}"
+{if $cv.generic_settings.logging}
+        logging="true"
+{else}
+        logging="false"
+{/if}
 {if $cv.optional.list_summary}
         listSummary="true"
 {else}
@@ -446,7 +455,7 @@
 {else}
         sendCompressedOutput="false"
 {/if}
-{if $cv.optional.uniq_identifier_active }
+{if $cv.optional.uniq_identifier_active}
         modificationDetectionAttribute="{$cv.optional.uniq_identifier}"
 {else}
         modificationDetectionAttribute=""
@@ -467,7 +476,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}
@@ -475,7 +483,7 @@
               gosaSupportURI="{$cv.optional.gosaSupportURI}"
               gosaSupportTimeout="{$cv.optional.gosaSupportTimeout}"
 {else}
-              disabled_gosaSupportURI="gosa-si-secret@server:20081}"
+              disabled_gosaSupportURI="gosa-si-secret@server:20081"
               disabled_gosaSupportTimeout="15"
 {/if}
 {if $cv.optional.login_attribute}
@@ -561,23 +569,16 @@
 {/if}
 {if $cv.generic_settings.snapshot_active}  
               enableSnapshots="true"
-{if $cv.generic_settings.snapshot_base != ""}
               snapshotBase="{$cv.generic_settings.snapshot_base}"
-{/if}
-{if $cv.generic_settings.snapshot_user != ""}
               snapshotAdminDn="{$cv.generic_settings.snapshot_user}"
-{/if}
-{if $cv.generic_settings.snapshot_password != ""}
               snapshotAdminPassword="{$cv.generic_settings.snapshot_password}"
-{/if}
-{if $cv.generic_settings.snapshot_server != ""}
               snapshotURI="{$cv.generic_settings.snapshot_server}"
-{/if}
-{/if}
-{if $cv.samba_version != 0}
-              sambaVersion="{$cv.samba_version}"
 {else}
-              sambaVersion="3"
+              enableSnapshots="false"
+              snapshotBase="dc=localhost,dc=de"
+              snapshotAdminDn="cn=admin,dc=localhost,dc=de"
+              snapshotAdminPassword="secret"
+              snapshotURI="ldap://localhost:389"
 {/if}
               config="ou=gosa,ou=configs,ou=systems,{$cv.base}">