X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fcontrib%2Fgosa.conf;h=e3d5f06be9018240d65d647d9095e563786a277d;hb=2bcc194f7b80c111f92d82dd4a58085743a3e44f;hp=c5869b2c467fac98ed533a78ace0fc23f1258eb4;hpb=e743023e6a82d9918355837c86c44fefe3f71468;p=gosa.git

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index c5869b2c4..e3d5f06be 100644
--- 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" />
@@ -56,23 +52,16 @@
       <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" class="systems" />
+      <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric,opsi/opsiGeneric" class="systems" />
       <!-- 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" class="faiManagement" />
-{else}
-      <!--  <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile" class="faiManagement" /> -->
-{/if}
+      <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile,fai/faiManagement,opsi/opsiProperties" class="faiManagement" />
       <plugin acl="gofaxlist" class="blocklist" />
       <plugin acl="gofonmacro" class="goFonMacro" />
       <plugin acl="gofonconference" class="phoneConferenceManagment" />
@@ -85,8 +74,8 @@
     <!--  <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" class="faxreport" />
-      <plugin acl="fonreport" class="fonreport" />
+      <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" />
@@ -119,7 +108,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" />
@@ -183,7 +172,6 @@
      <tab class="termgeneric" name="Generic" />
      <tab class="termstartup" name="Startup" />
      <tab class="termservice" name="Devices" />
-     <tab class="printgeneric" name="Printer" />
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <!--<tab class="glpiAccount" name="Inventory" /> -->
   </termtabs>
@@ -192,13 +180,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="goto_log_view" name="Installation logs" />
-{else}
-     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
-     <!-- <tab class="goto_log_view" name="Installation logs" /> -->
-{/if}
+     <tab class="gotoLogView" name="Installation logs" />
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </servtabs>
@@ -209,13 +192,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="goto_log_view" name="Installation logs" />
-{else}
-     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
-     <!-- <tab class="goto_log_view" name="Installation logs" /> -->
-{/if}
+     <tab class="gotoLogView" name="Installation logs" />
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </worktabs>
 
@@ -254,12 +232,9 @@
     <tab class="goLdapServer" />
     <tab class="goShareServer" />
     <tab class="gospamserver" />
-{if $cv.generic_settings.enableDHCP}
+    <tab class="govirusserver" />
     <tab class="servdhcp" />
-{/if}
-{if $cv.generic_settings.enableDNS}
     <tab class="servdns" />
-{/if}
     <tab class="gosaLogServer" />
   </serverservice>
 
@@ -284,6 +259,11 @@
     <tab class="dcObject" name="Generic" />
   </dcobject_tabs>
 
+  <!-- Role tabs -->
+  <roletabs>
+    <tab class="roleGeneric" name="Generic"/>
+  </roletabs>
+
   <ogrouptabs>
     <tab class="ogroup" name="Generic" />
   </ogrouptabs>
@@ -300,7 +280,11 @@
   <!-- Connectivity plugins -->
   <connectivity>
 {if $cv.mail == "kolab"}
-    <tab class='kolabAccount' /> 
+    <tab class='kolabAccount' />
+{else}
+<!--
+    <tab class='kolabAccount' />
+-->
 {/if}
     <tab class="proxyAccount" />
     <tab class="pureftpdAccount" />
@@ -326,8 +310,6 @@
     <tab class="csvimport" name="CSV Import" />
   </ldiftab>
 
-  <!-- FAI plugins -->
-{if $cv.enableFAI_management}
   <faipartitiontabs>
     <tab class="faiPartitionTable" name="Partitions" />
   </faipartitiontabs>
@@ -356,39 +338,16 @@
   <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" />
+  </opsitabs>
 
+  <opsiprodconfig>
+    <tab class="opsiProperties" name="Config" />
+  </opsiprodconfig>
 
   <!-- Logging plugin -->
   <logtabs>
@@ -457,51 +416,59 @@
         warnSSL="false"
 {/if}
 {if $cv.optional.ppd_path_active}
-       ppdPath="{$cv.optional.ppd_path}"
+        ppdGzip="true"
+        ppdPath="{$cv.optional.ppd_path}"
 {/if}
 {if $cv.optional.max_ldap_query_time_active}  
-       ldapMaxQueryTime="{$cv.optional.max_ldap_query_time}"
+        ldapMaxQueryTime="{$cv.optional.max_ldap_query_time}"
 {/if}
 {if $cv.optional.noprimarygroup}
-       primaryGroupFilter="true"
+        primaryGroupFilter="true"
 {/if}
 {if $cv.optional.mailQueueScriptPath_active}
-       mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
+        mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
 {/if}
 {if $cv.optional.user_filter_cookie}
-       storeFilterSettings="true"
+        storeFilterSettings="true"
 {else}
-       storeFilterSettings="false"
+        storeFilterSettings="false"
 {/if}
 {if $cv.compressed}
-       sendCompressedOutput="true"
+        sendCompressedOutput="true"
 {else}
-       sendCompressedOutput="false"
+        sendCompressedOutput="false"
 {/if}
 {if $cv.optional.uniq_identifier_active }
-       modificationDetectionAttribute="{$cv.optional.uniq_identifier}"
+        modificationDetectionAttribute="{$cv.optional.uniq_identifier}"
 {else}
-       modificationDetectionAttribute=""
-{/if}
-       language="{$cv.lang_selected}"
-       theme="{$cv.theme}"
-       sessionLifetime="{$cv.optional.session_lifetime}"
-       templateCompileDirectory="{$cv.optional.compile}"
-       debugLevel="{$cv.optional.debuglevel}"
-       sambaHashHook='{$cv.samba_settings.smbhash}'
+        modificationDetectionAttribute=""
+{/if}
+        language="{$cv.lang_selected}"
+        theme="{$cv.theme}"
+        sessionLifetime="{$cv.optional.session_lifetime}"
+        templateCompileDirectory="{$cv.optional.compile}"
+        debugLevel="{$cv.optional.debuglevel}"
+        sambaHashHook='{$cv.samba_settings.smbhash}'
     >
 
     <!-- Location definition -->
     <location name="{$cv.location}"
               passwordDefaultHash="{$cv.encryption}"
               accountPrimaryAttribute="{$cv.peopledn}"
-              userSubtree="{$cv.peopleou}"
-              groupSubtree="{$cv.groupou}"
+              userRDN="{$cv.peopleou}"
+              groupRDN="{$cv.groupou}"
               gidNumberBase="{$cv.uidbase}"
               uidNumberBase="{$cv.uidbase}"
               logging="{$cv.generic_settings.logging}"
 {if $cv.optional.sudoou_active}
-              sudoSubtree="{$cv.optional.sudoou}"
+              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}"
@@ -535,7 +502,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}"
@@ -546,8 +513,13 @@
               strictNamingRules="false"
 {/if}
 {if $cv.id_settings.minid_active}
-              minid="{$cv.id_settings.minid}"
+              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 +527,6 @@
 {else}
               cyrusUseSlashes="false"
 {/if}
-              mailAttribute="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
               vacationTemplateDirectory="{$cv.mail_settings.vacationdir}"
 {/if}
@@ -600,7 +571,7 @@
 {else}
               sambaVersion="3"
 {/if}
-              configBase="ou=gosa,ou=configs,ou=systems,{$cv.base}">
+              config="ou=gosa,ou=configs,ou=systems,{$cv.base}">
 
               <referral URI="{$cv.connection}/{$cv.base}"
                         adminDn="{$cv.admin}"