Added base selector. readonly in the moment

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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 9ce57ebc6b0aed0f3dd39b7dfb9f44e96438bb2c..da0df2c9a0c15ddb7c22043e48da1f14ebfabb0d 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -72,12 +72,12 @@
 
     <!-- Section to enable addon plugins -->
     <section name="Addons">
+      <plugin acl="rsyslog"  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>
@@ -231,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" />
@@ -243,7 +245,7 @@
     <tab class="govirusserver" />
     <tab class="servdhcp" />
     <tab class="servdns" />
-    <tab class="gosaLogServer" />
+    <tab class="rSyslogServer" />
   </serverservice>
 
   <!-- Department plugin -->
@@ -361,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 **********************************************************
 
@@ -378,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}
@@ -471,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}