X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fgosa.conf;h=3bbcdd2e0014a5d8065309258f314d6eb1cd6f7f;hb=f31bf4a8f6d635d5905b96535762432cd5a6825a;hp=a610525d3bda63f6a62a7cf05d103b80adce1f5c;hpb=9b6adf663ce3f6e6d64cf8dad98cdafcd428b4ee;p=gosa.git

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index a610525d3..3bbcdd2e0 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -15,14 +15,25 @@
 				path="plugins/personal/mail" />
 			<plugin acl="default" class="sambaAccount" icon="samba.png"
 				path="plugins/personal/samba" />
+{if $cv.use_netatalk}
 			<plugin acl="default" class="netatalk" icon="netatalk.png"
 				path="plugins/personal/netatalk" />
+{else}
+<!--
+			<plugin acl="default" class="netatalk" icon="netatalk.png"
+				path="plugins/personal/netatalk" />
+-->
+{/if}
 			<plugin acl="default" class="connectivity" icon="proxy.png"
 				path="plugins/personal/connectivity" />
 			<plugin acl="default" class="gofaxAccount" icon="fax.png"
 				path="plugins/gofax/faxaccount" />
 			<plugin acl="default" class="phoneAccount" icon="phone.png"
 				path="plugins/gofon/phoneaccount" />
+<!--
+            <plugin acl="default" class="nagiosAccount" icon="monitoring.png"
+                path="plugins/personal/nagios" />
+-->
 <!-- 
             <plugin acl="default" class="nagiosAccount" icon="monitoring.png"
                 path="plugins/personal/nagios" /> 
@@ -50,10 +61,16 @@
 			<!-- Use 'lock_dn'      for dn
                      'lock_name'    for name
                      'lock_type'    for branch/freeze -->
+
+{if $cv.enableFAI_management}
+			<plugin acl="FAIclass" class="faiManagement" icon="fai.png" 
+				path="plugins/admin/fai" />
+{else}
+<!--
 			<plugin acl="FAIclass" class="faiManagement" icon="fai.png" 
-				postcreate="" 
-                postremove="" 
 				path="plugins/admin/fai" />
+-->
+{/if}
 			<plugin acl="blocklists" class="blocklist" icon="blocklists.png"
 				path="plugins/gofax/blocklists" />
 			<plugin acl="goFonMacro" class="gofonMacro" icon="macros.png"
@@ -86,16 +103,29 @@
 		</section>
 	</menu>
 
+    <aclroletab>
+        <tab class="aclRole" name="ACL Role" />
+    </aclroletab>
+
 	<usertabs>
 		<tab class="user" name="Generic" />
 		<tab class="posixAccount" name="Unix" />
 		<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="connectivity" name="Connectivity" />
 		<tab class="gofaxAccount" name="Fax" />
 		<tab class="phoneAccount" name="Phone" />
+<!--
+        <tab class="scalixAccount" name="Scalix" />
+-->
 <!--            
 		<tab class="nagiosAccount" name="Nagios" /> 
 -->
@@ -132,14 +162,30 @@
 		<tab class="termservice" name="Devices" />
 		<tab class="printgeneric" name="Printer" />
 		<tab class="terminfo" name="Information" />
+		<tab class="glpiAccount" name="Inventory" />
 	</termtabs>
 
 	<servtabs>
 		<tab class="servgeneric" name="Generic" />
 		<tab class="workstartup" name="Startup" />
 		<tab class="serverService" name="Services" />
-		<tab class="faiSummaryTab" name="FAI summary" />
+{if $cv.enableFAI_management}
+	    <tab class="faiSummaryTab" name="FAI summary" />
+{else}
+<!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
+{/if}
+{if $cv.generic_settings.enableDNS}
+	   <tab class="servdns" name="DNS" />
+{else}
+<!--   <tab class="servdns" name="DNS" /> -->
+{/if}
+{if $cv.generic_settings.enableDHCP}
+	   <tab class="servdhcp" name="DHCP" />
+{else}
+<!--   <tab class="servdhcp" name="DHCP" /> -->
+{/if}
 		<tab class="terminfo" name="Information" />
+		<tab class="glpiAccount" name="Inventory" />
 	</servtabs>
 
 	<worktabs>
@@ -148,17 +194,34 @@
 		<tab class="workservice" name="Devices" />
 		<tab class="printgeneric" name="Printer" />
 		<tab class="terminfo" name="Information" />
-		<tab class="faiSummaryTab" name="FAI summary" />
+{if $cv.enableFAI_management}
+	    <tab class="faiSummaryTab" name="FAI summary" />
+{else}
+<!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
+{/if}
+		<tab class="glpiAccount" name="Inventory" />
 	</worktabs>
 
 	<printtabs>
 		<tab class="printgeneric" name="Generic" />
+		<tab class="glpiPrinterAccount" name="Inventory" />
 	</printtabs>
 
     <phonetabs>
         <tab class="phonegeneric" name="Generic" />
+		<tab class="glpiAccount" name="Inventory" />
     </phonetabs>
 
+    <componenttabs>
+    	<tab class="componentgeneric" name="Generic" />
+		<tab class="glpiAccount" name="Inventory" />
+    </componenttabs>
+
+    <wintabs>
+    	<tab class="wingeneric" name="Generic" />
+		<tab class="glpiAccount" name="Inventory" />
+    </wintabs>
+
 	<serverservice>
         <tab class="goMailServer" />
 {if $cv.mail == "kolab"}
@@ -177,16 +240,10 @@
         <tab class="goTerminalServer" />
         <tab class="goLdapServer" />
         <tab class="goShareServer" />
+        <tab class="servdns" />
+        <tab class="gosaLogServer" />
     </serverservice>
 
-    <componenttabs>
-    	<tab class="componentgeneric" name="Generic" />
-    </componenttabs>
-
-    <wintabs>
-    	<tab class="wingeneric" name="Generic" />
-    </wintabs>
-
     <deptabs>
     	<tab class="department" name="Generic" />
     </deptabs>
@@ -212,8 +269,8 @@
 <!--	
 		<tab class="pptpAccount" /> 
 		<tab class="phpscheduleitAccount" /> 
-		<tab class="glpiAccount" /> 
 -->
+		<tab class="glpiAccount" /> 
 	</connectivity>
 
 	<ldiftab>
@@ -223,6 +280,7 @@
 		<tab class="csvimport" name="CSV Import" />
 	</ldiftab>
 
+{if $cv.enableFAI_management}
 	<faipartitiontabs>
 		<tab class="faiPartitionTable" name="Partitions" />
 	</faipartitiontabs>
@@ -251,9 +309,50 @@
 	<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}
+
+	<logtabs>
+			<tab class="logview" name="System logs" />
+			<tab class="gosa_logview" name="GOsa logs" />
+	</logtabs>
 	
 	<main default="{$cv.location}"
-
+{if $cv.optional.list_summary}
+		list_summary="true"
+{else}
+		list_summary="false"
+{/if}
 {if $cv.pwd_rules.pwminlen_active}
 		pwminlen="{$cv.pwd_rules.pwminlen}"
 {/if}
@@ -312,11 +411,6 @@
 {/if}
 {if $cv.optional.auto_network_hook_active}
 		auto_network_hook="{$cv.optional.auto_network_hook} "
-{/if}
-{if $cv.optional.strict_units}
-		strict_units="true"
-{else}
-		strict_units="false"
 {/if}
 		lang="{$cv.lang_selected}"
 		theme="{$cv.theme}"
@@ -334,6 +428,14 @@
 			groups="{$cv.groupou}"
 			gidbase="{$cv.uidbase}"
 			uidbase="{$cv.uidbase}"
+{if $cv.timezone}
+			timezone="{$cv.timezone}"
+{/if}
+{if $cv.optional.strict_units}
+			strict_units="true"
+{else}
+			strict_units="false"
+{/if}
 {if $cv.krbsasl}
 			krbsasl="true"
 {else}
@@ -425,15 +527,6 @@
 				password="{$cv.password}" />
 		</location>
 
-		<language name="German" tag="de_DE" />
-		<language name="Russian" tag="ru_RU" />
-		<language name="Spanish" tag="es_ES" />
-		<language name="French" tag="fr_FR" />
-		<language name="Dutch" tag="nl_NL" />
-		<language name="English" tag="en_EN" />
-		<language name="Italian" tag="it_IT" />
-		<language name="Polish" tag="pl_PL" />
-
 		<faxformat type="pdf" />
 		<faxformat type="ps" />
 		<faxformat type="png" />