Updated contrib conf

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5967 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 689c3eefc35223597fd274a2811a918ea385d6f8..e9de57bf19ea5103754b61b25358bd06e2f5de3a 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -153,9 +153,11 @@
 
        <serverservice>
         <tab class="goMailServer" />
-               %%VERGESESN KOLAB TAB %%
+{if $cv.mail == "kolab"}
+               <tab class="servkolab" />
+{/if}
         <tab class="goNtpServer" />
-       <tab class="servrepository" />
+               <tab class="servrepository" />
         <tab class="goImapServer" />
         <tab class="goKrbServer" />
         <tab class="goFaxServer" />
@@ -186,22 +188,23 @@
     </ogrouptabs>
 
     <connectivity>
-               %%VERGESESN KOLAB TAB %%
-       <tab class="proxyAccount" />
-       <tab class="pureftpdAccount" />
-       <tab class="webdavAccount" />
-       <tab class="phpgwAccount" />
-       <tab class="intranetAccount" />
-       <tab class="opengwAccount"
+{if $cv.mail == "kolab"}
+               <tab class='kolabAccount' /> 
+{/if}
+               <tab class="proxyAccount" />
+               <tab class="pureftpdAccount" />
+               <tab class="webdavAccount" />
+               <tab class="phpgwAccount" />
+               <tab class="intranetAccount" />
+               <tab class="opengwAccount"
              username="OGo"
              password=""
              database="OGo"
              datahost="localhost" />
-
 <!--   
-       <tab class="pptpAccount" /> 
-       <tab class="phpscheduleitAccount" /> 
-       <tab class="glpiAccount" /> 
+               <tab class="pptpAccount" /> 
+               <tab class="phpscheduleitAccount" /> 
+               <tab class="glpiAccount" /> 
 -->
        </connectivity>
 
@@ -337,6 +340,8 @@
 {/if}
 {if $cv.governmentmode}
                        governmentmode="true"
+{else}
+                       governmentmode="false"
 {/if}
 {if $cv.sambaidmapping}
                        sambaidmapping="true"