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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 194da5b6c..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,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,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="gofaxlist" class="blocklist" />
       <plugin acl="gofonmacro" class="goFonMacro" />
       <plugin acl="gofonconference" class="phoneConferenceManagment" />
@@ -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" />
@@ -191,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="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 +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="gotoLogView" name="Installation logs" />
-{else}
-     <!-- <tab class="faiSummaryTab" name="Deployment summary" /> -->
-     <!-- <tab class="gotoLogView" name="Installation logs" /> -->
-{/if}
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </worktabs>
 
@@ -254,12 +233,8 @@
     <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" />
   </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>
@@ -330,8 +310,6 @@
     <tab class="csvimport" name="CSV Import" />
   </ldiftab>
 
-  <!-- FAI plugins -->
-{if $cv.enableFAI_management}
   <faipartitiontabs>
     <tab class="faiPartitionTable" name="Partitions" />
   </faipartitiontabs>
@@ -370,49 +348,6 @@
   <opsiprodconfig>
     <tab class="opsiProperties" name="Config" />
   </opsiprodconfig>
-{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>
-
-  <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>
-  -->
-{/if}
-
 
   <!-- Logging plugin -->
   <logtabs>
@@ -481,6 +416,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}  
@@ -527,6 +463,13 @@
 {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}
@@ -573,6 +516,10 @@
               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}