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 c5b0419dd8288c64c308ebf63c5e22e7f4bf2870..a57f6c5c3bf8d2f76451983d85e11a10b6e2ce8c 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -38,11 +38,7 @@
       <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:self" class="netatalk" />
-{else}
-      <!--  <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" />
@@ -50,29 +46,23 @@
       <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="roles" class="roleManagement"/>
       <plugin acl="ogroups" class="ogroupManagement" />
       <plugin acl="application" class="applicationManagement" />
-{if $cv.enableMimeType}
       <plugin acl="mimetypes" class="mimetypeManagement" />
-{else}
-      <!--  <plugin acl="mimetypes"  class="mimetypeManagement" /> -->
-{/if}
       <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 -->
-{if $cv.enableFAI_management}
       <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile,fai/faiManagement,opsi/opsiProperties" class="faiManagement" />
-{else}
-      <!--  <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile" class="faiManagement" /> -->
-{/if}
+      <plugin acl="opsi" class="opsiLicenses"/>
       <plugin acl="gofaxlist" class="blocklist" />
       <plugin acl="gofonmacro" class="goFonMacro" />
       <plugin acl="gofonconference" class="phoneConferenceManagment" />
@@ -82,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>
@@ -108,6 +98,10 @@
    -->
 
   <!-- ACL dialog -->
+  <acltab>
+    <tab class="acl" name="ACL" />
+  </acltab>
+
   <aclroletab>
     <tab class="aclRole" name="ACL Role" />
   </aclroletab>
@@ -119,7 +113,7 @@
      <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="netatalk" name="Netatalk" />
      <tab class="connectivity" name="Connectivity" />
      <tab class="gofaxAccount" name="Fax" />
      <tab class="phoneAccount" name="Phone" />
@@ -127,6 +121,11 @@
      <tab class="nagiosAccount" name="Nagios" /> 
    </usertabs>
 
+  <opsiLicenseTabs>
+    <tab class="licensePoolGeneric" name="Generic"/>
+    <tab class="licenseUsage" name="Usage"/>
+  </opsiLicenseTabs>
+
   <!-- Group dialog -->
   <grouptabs>
     <tab class="group" name="Generic" />
@@ -191,13 +190,8 @@
      <tab class="servgeneric" name="Generic" />
      <tab class="workstartup" name="Startup" />
      <tab class="ServerService" name="Services" />
-{if $cv.enableFAI_management}
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
-{else}
-     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
-     <!-- <tab class="gotoLogView" name="Installation logs" /> -->
-{/if}
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </servtabs>
@@ -208,13 +202,8 @@
      <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="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
-{else}
-     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
-     <!-- <tab class="gotoLogView" name="Installation logs" /> -->
-{/if}
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </worktabs>
 
@@ -235,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" />
@@ -244,23 +235,17 @@
     <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="gospamserver" />
     <tab class="govirusserver" />
-{if $cv.generic_settings.enableDHCP}
     <tab class="servdhcp" />
-{/if}
-{if $cv.generic_settings.enableDNS}
     <tab class="servdns" />
-{/if}
-    <tab class="gosaLogServer" />
+    <tab class="rSyslogServer" />
   </serverservice>
 
   <!-- Department plugin -->
@@ -284,6 +269,15 @@
     <tab class="dcObject" name="Generic" />
   </dcobject_tabs>
 
+  <domain_tabs>
+    <tab class="domain" name="Generic" />
+  </domain_tabs>
+
+  <!-- Role tabs -->
+  <roletabs>
+    <tab class="roleGeneric" name="Generic"/>
+  </roletabs>
+
   <ogrouptabs>
     <tab class="ogroup" name="Generic" />
   </ogrouptabs>
@@ -299,8 +293,10 @@
 
   <!-- Connectivity plugins -->
   <connectivity>
-{if $cv.mail == "kolab"}
-    <tab class='kolabAccount' /> 
+{if $cv.mail == "Kolab" || $cv.mail == "Kolab22"}
+    <tab class='kolabAccount' />
+{else}
+<!-- <tab class='kolabAccount' /> -->
 {/if}
     <tab class="proxyAccount" />
     <tab class="pureftpdAccount" />
@@ -326,8 +322,6 @@
     <tab class="csvimport" name="CSV Import" />
   </ldiftab>
 
-  <!-- FAI plugins -->
-{if $cv.enableFAI_management}
   <faipartitiontabs>
     <tab class="faiPartitionTable" name="Partitions" />
   </faipartitiontabs>
@@ -356,46 +350,23 @@
   <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}
+  <opsitabs>
+    <tab class="opsiGeneric" name="Opsi" />
+    <tab class="opsiSoftware" name="Hardware information" />
+    <tab class="opsiHardware" name="software information" />
+    <tab class="licenseUsageByHost" name="Usage"/>
+  </opsitabs>
 
+  <opsiprodconfig>
+    <tab class="opsiProperties" name="Config" />
+    <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 **********************************************************
 
@@ -407,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}
@@ -457,6 +433,7 @@
         warnSSL="false"
 {/if}
 {if $cv.optional.ppd_path_active}
+        ppdGzip="true"
         ppdPath="{$cv.optional.ppd_path}"
 {/if}
 {if $cv.optional.max_ldap_query_time_active}  
@@ -478,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=""
@@ -499,10 +476,16 @@
               groupRDN="{$cv.groupou}"
               gidNumberBase="{$cv.uidbase}"
               uidNumberBase="{$cv.uidbase}"
-              logging="{$cv.generic_settings.logging}"
 {if $cv.optional.sudoou_active}
               sudoRDN="{$cv.optional.sudoou}"
 {/if}
+{if $cv.optional.gosaSupportURI_active}
+              gosaSupportURI="{$cv.optional.gosaSupportURI}"
+              gosaSupportTimeout="{$cv.optional.gosaSupportTimeout}"
+{else}
+              disabled_gosaSupportURI="gosa-si-secret@server:20081"
+              disabled_gosaSupportTimeout="15"
+{/if}
 {if $cv.optional.login_attribute}
               loginAttribute="{$cv.optional.login_attribute}"
 {else}
@@ -535,7 +518,7 @@
               nextIdHook="{$cv.base_hook}"
 {/if}
 {if $cv.generic_settings.wws_ou_active}
-              sambaMachineAccountBase="{$cv.generic_settings.wws_ou}"
+              sambaMachineAccountRDN="{$cv.generic_settings.wws_ou}"
 {/if}
 {if $cv.id_settings.idgen_active}
               idGenerator="{$cv.id_settings.idgen}"
@@ -548,6 +531,11 @@
 {if $cv.id_settings.minid_active}
               minId="{$cv.id_settings.minid}"
 {/if}
+              mailAttribute="{$cv.mail_attrib}"
+              gosaSharedPrefix=""
+              mailUserCreation=""
+              mailFolderCreation=""
+              imapTimeout="10"
 {if $cv.mail != "disabled"}
               mailMethod="{$cv.mail}"
 {if $cv.cyrusunixstyle}
@@ -555,7 +543,6 @@
 {else}
               cyrusUseSlashes="false"
 {/if}
-              mailAttribute="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
               vacationTemplateDirectory="{$cv.mail_settings.vacationdir}"
 {/if}
@@ -582,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}">