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 b3da0cfb0784b12f349efe7e158e503abe3755d3..194da5b6c4bdd548f952b66d38baf0ca6298cf3b 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -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" />
@@ -362,6 +366,10 @@
     <tab class="opsiSoftware" name="Hardware information" />
     <tab class="opsiHardware" name="software information" />
   </opsitabs>
+
+  <opsiprodconfig>
+    <tab class="opsiProperties" name="Config" />
+  </opsiprodconfig>
 {else}
   <!-- 
   <faipartitiontabs>
@@ -399,6 +407,9 @@
     <tab class="opsiHardware" name="software information" />
   </opsitabs>
 
+  <opsiprodconfig>
+    <tab class="opsiProperties" name="Config" />
+  </opsiprodconfig>
   -->
 {/if}
 
@@ -548,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}"
@@ -561,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}
@@ -568,7 +580,6 @@
 {else}
               cyrusUseSlashes="false"
 {/if}
-              mailAttribute="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
               vacationTemplateDirectory="{$cv.mail_settings.vacationdir}"
 {/if}