X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fgosa.conf;h=36a074e37b2887658139780dec68023826dbf798;hb=68e68a995748bf8bb71cf4d611c64ead379ab1f9;hp=5ad665ee56c4affdc76245f7f36202c79a0a723d;hpb=196568f754f4ce68dae7af8fad9dcec40df01031;p=gosa.git

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 5ad665ee5..36a074e37 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -13,6 +13,8 @@
 				path="plugins/personal/mail" />
 			<plugin acl="default" class="sambaAccount" icon="samba.png"
 				path="plugins/personal/samba" />
+			<plugin acl="default" class="netatalk" icon="netatalk.png"
+				path="plugins/personal/netatalk" />
 			<plugin acl="default" class="connectivity" icon="proxy.png"
 				path="plugins/personal/connectivity" />
 			<plugin acl="default" class="gofaxAccount" icon="fax.png"
@@ -64,8 +66,6 @@
 			<plugin acl="logview" class="logview" icon="logview.png"
 				path="plugins/addons/logview" />
 			<plugin acl="mailqueue" class="mailqueue" icon="mailqueue.png"
-				mailqueue_query_command	="" 
-				mailqueue_remove_command="" 
 				path="plugins/addons/mailqueue" />
 			<plugin acl="ldapmanager" class="ldif" icon="ldif.png"
 				path="plugins/addons/ldapmanager" />
@@ -78,10 +78,11 @@
 		<tab class="environment" name="Environment" />
 		<tab class="mailAccount" name="Mail" />
 		<tab class="sambaAccount" name="Samba" />
+		<tab class="netatalk" name="Netatalk" />
 		<tab class="connectivity" name="Connectivity" />
 		<tab class="gofaxAccount" name="Fax" />
 		<tab class="phoneAccount" name="Phone" />
-<!--                <tab class="nagiosAccount" name="Nagios" /> -->
+<!--            <tab class="nagiosAccount" name="Nagios" /> -->
 		<tab class="reference" name="References" />
 	</usertabs>
 
@@ -122,16 +123,15 @@
 
 	<servtabs>
 		<tab class="servgeneric" name="Generic" />
-		<tab class="servdb" name="Databases" />
-		<tab class="servservice" name="Services" />
+		<tab class="workstartup" name="Startup" />
+		<tab class="serverService" name="Services" />
 		{servKolab}
-
 		<!-- external_hook should return something like that 
-			 DisplayName:ServerName
-        -->
+			 DisplayName:ServerName -->
 		<tab class="servrepository" name="Repository"
                         external_hook="/bin/echo ''" />
-    	<tab class="servrepository" name="Repository" />
+		<tab class="servrepository" name="Repository" />
+		<tab class="faiSummaryTab" name="FAI summary" />
 		<tab class="terminfo" name="Information" />
 		<tab class="reference" name="References" />
 	</servtabs>
@@ -142,6 +142,7 @@
 		<tab class="workservice" name="Devices" />
 		<tab class="printgeneric" name="Printer" />
 		<tab class="terminfo" name="Information" />
+		<tab class="faiSummaryTab" name="FAI summary" />
 		<tab class="reference" name="References" />
 	</worktabs>
 
@@ -155,6 +156,22 @@
         <tab class="reference" name="References" />
     </phonetabs>
 
+	<serverservice>
+        <tab class="goMailServer" />
+        <tab class="goNtpServer" />
+        <tab class="goImapServer" />
+        <tab class="goKrbServer" />
+        <tab class="goFaxServer" />
+        <tab class="goFonServer" />
+        <tab class="goLogDBServer" />
+        <tab class="goGlpiServer" />
+        <tab class="goCupsServer" />
+        <tab class="goSyslogServer" />
+        <tab class="goTerminalServer" />
+        <tab class="goLdapServer" />
+        <tab class="goShareServer" />
+    </serverservice>
+
     <componenttabs>
         <tab class="componentgeneric" name="Generic" />
         <tab class="reference" name="References" />
@@ -221,7 +238,8 @@
 	</faitemplatetabs>
 
 	<faiprofiletabs>
-			<tab class="faiProfile" name="Profiles" />
+		<tab class="faiProfile" name="Profiles" />
+		<tab class="faiSummaryTab" name="Summary" />
 	</faiprofiletabs>
 
 	<faipackagetabs>
@@ -229,10 +247,14 @@
 	</faipackagetabs>
 	
 	<main default="{LOCATIONNAME}"
+		mailQueueScriptPath="/usr/bin/sudo /usr/local/sbin/mailqueue %action %id %server" 
 		enableCopyPaste="false" 
 		ppd_path="/var/spool/ppd/" 
 		kde_applications_menu="" 
 		compile="/var/spool/gosa"
+		resolution_hook="/etc/gosa/resolutions"
+		additionalrestrictionfilters="/bin/echo ''"
+		additionalprotocolls        ="/bin/echo ''"
 		lang=""
 		theme="default"
 		debuglevel="0"
@@ -244,6 +266,7 @@
 		smbhash='{SMBHASH}'
 		session_lifetime="7200"
 		schema_check="true"
+	    max_ldap_query_time="5.0"
 		displayerros="{errorlvl}">
 
 		<location name="{LOCATIONNAME}"
@@ -271,6 +294,7 @@
 		<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" />