Added changelog entry.

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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 210d7c59a85177d1de28635ef785b8d23280e305..194da5b6c4bdd548f952b66d38baf0ca6298cf3b 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -85,8 +85,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" />
@@ -300,7 +300,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" />
@@ -356,6 +360,16 @@
   <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>
 {else}
   <!-- 
   <faipartitiontabs>
@@ -386,6 +400,16 @@
   <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}
 
@@ -457,38 +481,38 @@
         warnSSL="false"
 {/if}
 {if $cv.optional.ppd_path_active}
-       ppdPath="{$cv.optional.ppd_path}"
+        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 -->
@@ -535,7 +559,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 +572,7 @@
 {if $cv.id_settings.minid_active}
               minId="{$cv.id_settings.minid}"
 {/if}
+              mailAttribute="{$cv.mail_attrib}"
 {if $cv.mail != "disabled"}
               mailMethod="{$cv.mail}"
 {if $cv.cyrusunixstyle}
@@ -555,7 +580,6 @@
 {else}
               cyrusUseSlashes="false"
 {/if}
-              mailAttribute="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
               vacationTemplateDirectory="{$cv.mail_settings.vacationdir}"
 {/if}