X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fgosa.conf;h=26a9ee26d23d1e947169d2346c1030778c7a3870;hb=7fab67a158c34c5f49f79d27c3d34a0a4794f440;hp=04d6355cfafe86a225d0ee71c180495ce7cf849e;hpb=7230f51fe5035a4c5ff68342c7d409c3767f7574;p=gosa.git

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 04d6355cf..26a9ee26d 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -110,7 +110,10 @@
 				path="plugins/addons/gotomasses" />
 -->
 {/if}
-
+<!--
+			<plugin acl="all" class="bugsubmitter" icon="bugsubmitter.png"
+				path="plugins/addons/bugsubmitter" />
+-->
 		</section>
 	</menu>
 
@@ -142,6 +145,10 @@
 -->
 	</usertabs>
 
+	<faxblocktabs>
+		<tab class="blocklistGeneric" name="Generic" />
+	</faxblocktabs>
+
 	<mimetabs>
 		<tab class="mimetype" name="Generic" />
 	</mimetabs>
@@ -177,7 +184,8 @@
 		<tab class="termstartup" name="Startup" />
 		<tab class="termservice" name="Devices" />
 		<tab class="printgeneric" name="Printer" />
-		<tab class="terminfo" name="Information" />
+		<tab class="terminfo" name="Information" 
+			snmpcommunity="{$cv.optional.snmpcommunity}" />
 		<tab class="glpiAccount" name="Inventory" />
 	</termtabs>
 
@@ -190,17 +198,8 @@
 {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="terminfo" name="Information" 
+			snmpcommunity="{$cv.optional.snmpcommunity}" />
 		<tab class="glpiAccount" name="Inventory" />
 	</servtabs>
 
@@ -209,7 +208,8 @@
 		<tab class="workstartup" name="Startup" />
 		<tab class="workservice" name="Devices" />
 		<tab class="printgeneric" name="Printer" />
-		<tab class="terminfo" name="Information" />
+		<tab class="terminfo" name="Information" 
+			snmpcommunity="{$cv.optional.snmpcommunity}" />
 {if $cv.enableFAI_management}
 	    <tab class="faiSummaryTab" name="FAI summary" />
 {else}
@@ -229,7 +229,7 @@
 	</phonetabs>
 
 	<componenttabs>
-		<tab class="componentgeneric" name="Generic" />
+		<tab class="componentGeneric" name="Generic" />
 		<tab class="glpiAccount" name="Inventory" />
 	</componenttabs>
 
@@ -257,7 +257,12 @@
 		<tab class="goTerminalServer" />
 		<tab class="goLdapServer" />
 		<tab class="goShareServer" />
+{if $cv.generic_settings.enableDHCP}
+		<tab class="servdhcp" />
+{/if}
+{if $cv.generic_settings.enableDNS}
 		<tab class="servdns" />
+{/if}
 		<tab class="gosaLogServer" />
 	</serverservice>
 
@@ -437,6 +442,11 @@
 		compressed="true"
 {else}
 		compressed="false"
+{/if}
+{if $cv.optional.uniq_identifier_active }
+		uniq_identifier="{$cv.optional.uniq_identifier}"
+{else}
+		uniq_identifier=""
 {/if}
 		lang="{$cv.lang_selected}"
 		theme="{$cv.theme}"
@@ -454,6 +464,11 @@
 			groups="{$cv.groupou}"
 			gidbase="{$cv.uidbase}"
 			uidbase="{$cv.uidbase}"
+{if $cv.optional.login_attribute}
+			login_attribute="{$cv.optional.login_attribute}"
+{else}
+			login_attribute="uid"
+{/if}
 {if $cv.timezone}
 			timezone="{$cv.timezone}"
 {/if}
@@ -552,11 +567,5 @@
 				admin="{$cv.admin}"
 				password="{$cv.password}" />
 		</location>
-
-		<faxformat type="pdf" />
-		<faxformat type="ps" />
-		<faxformat type="png" />
-		<faxformat type="mtiff" />
-		<faxformat type="tiff" />
 	</main>
 </conf>