X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fgosa.conf;h=7afd0e727914a5831d6bb771ae5bb7cb91655c38;hb=5e8e21cc2b5614c450cac272a70a1b6e005cdb2e;hp=2b3c3a39af5a361834688eebcfcc482e632cfc40;hpb=e8378bc89f153eae326658e68d8dc24d8ba6d669;p=gosa.git

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 2b3c3a39a..7afd0e727 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -13,8 +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="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"
@@ -40,6 +40,8 @@
 				icon="application.png" path="plugins/admin/applications" />
 			<plugin acl="systems" class="systems" icon="system.png"
 				path="plugins/admin/systems" />
+			<plugin acl="mimetype" class="mimetypeManagement"
+				icon="mimetypes.png" path="plugins/admin/mimetypes" />
 
 			<!-- Use 'lock_dn'      for dn
                      'lock_name'    for name
@@ -69,6 +71,8 @@
 				path="plugins/addons/mailqueue" />
 			<plugin acl="ldapmanager" class="ldif" icon="ldif.png"
 				path="plugins/addons/ldapmanager" />
+			<plugin acl="notifications" class="msgplug" icon="notifications.png"
+                                path="plugins/addons/notifications" />
 		</section>
 	</menu>
 
@@ -78,38 +82,37 @@
 		<tab class="environment" name="Environment" />
 		<tab class="mailAccount" name="Mail" />
 		<tab class="sambaAccount" name="Samba" />
-<!--		<tab class="netatalk" name="Netatalk" /> -->
+		<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="reference" name="References" />
+<!--            <tab class="nagiosAccount" name="Nagios" /> -->
 	</usertabs>
 
+	<mimetabs>
+		<tab class="mimetype" name="Generic" />
+	</mimetabs>
+
 	<grouptabs>
 		<tab class="group" name="Generic" />
 		<tab class="environment" name="Environment" />
 		<tab class="appgroup" name="Applications" />
 		<tab class="mailgroup" name="Mail" />
 		<tab class="acl" name="ACL" />
-		<tab class="reference" name="References" />
 	</grouptabs>
 
 	<appstabs>
 		<tab class="application" name="Generic" />
 		<tab class="applicationParameters" name="Options" />
-		<tab class="reference" name="References" />
 	</appstabs>
 
 	<conferencetabs>
 		<tab class="conference" name="Generic" />
-		<tab class="reference" name="References" />
 	</conferencetabs>
 
 	<macrotabs>
 		<tab class="macro" name="Generic" />
 		<tab class="macroParameter" name="Parameter" />
-		<tab class="reference" name="References" />
 	</macrotabs>
 
 	<termtabs>
@@ -118,23 +121,14 @@
 		<tab class="termservice" name="Devices" />
 		<tab class="printgeneric" name="Printer" />
 		<tab class="terminfo" name="Information" />
-		<tab class="reference" name="References" />
 	</termtabs>
 
 	<servtabs>
 		<tab class="servgeneric" name="Generic" />
-		<tab class="servdb" name="Databases" />
-		<tab class="servservice" name="Services" />
-		{servKolab}
-
-		<!-- external_hook should return something like that 
-			 DisplayName:ServerName
-        -->
-		<tab class="servrepository" name="Repository"
-                        external_hook="/bin/echo ''" />
-    	<tab class="servrepository" name="Repository" />
+		<tab class="workstartup" name="Startup" />
+		<tab class="serverService" name="Services" />
+		<tab class="faiSummaryTab" name="FAI summary" />
 		<tab class="terminfo" name="Information" />
-		<tab class="reference" name="References" />
 	</servtabs>
 
 	<worktabs>
@@ -143,56 +137,67 @@
 		<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" />
+		<tab class="faiSummaryTab" name="FAI summary" />
 	</worktabs>
 
 	<printtabs>
 		<tab class="printgeneric" name="Generic" />
-		<tab class="reference" name="References" />
 	</printtabs>
 
     <phonetabs>
         <tab class="phonegeneric" name="Generic" />
-        <tab class="reference" name="References" />
     </phonetabs>
 
+	<serverservice>
+        <tab class="goMailServer" />
+		{servKolab}
+        <tab class="goNtpServer" />
+	<tab class="servrepository" />
+        <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" />
+    	<tab class="componentgeneric" name="Generic" />
     </componenttabs>
 
-	<wintabs>
-		<tab class="wingeneric" name="Generic" />
-		<tab class="reference" name="References" />
-	</wintabs>
-
-	<deptabs>
-		<tab class="department" name="Generic" />
-		<tab class="reference" name="References" />
-	</deptabs>
-
-	<ogrouptabs>
-		<tab class="ogroup" name="Generic" />
-		<tab class="reference" name="References" />
-	</ogrouptabs>
-
-	<connectivity>
-		{kolabAccount}<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" /> -->
+    <wintabs>
+    	<tab class="wingeneric" name="Generic" />
+    </wintabs>
+
+    <deptabs>
+    	<tab class="department" name="Generic" />
+    </deptabs>
+
+    <ogrouptabs>
+    	<tab class="ogroup" name="Generic" />
+    </ogrouptabs>
+
+    <connectivity>
+	{kolabAccount}
+	<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" /> -->
 	</connectivity>
 
 	<ldiftab>
@@ -203,36 +208,35 @@
 	</ldiftab>
 
 	<faipartitiontabs>
-			<tab class="faiPartitionTable" name="Partitions" />
+		<tab class="faiPartitionTable" name="Partitions" />
 	</faipartitiontabs>
 
 	<faiscripttabs>
-			<tab class="faiScript" name="Script" />
+		<tab class="faiScript" name="Script" />
 	</faiscripttabs>
 
 	<faihooktabs>
-			<tab class="faiHook" name="Hooks" />
+		<tab class="faiHook" name="Hooks" />
 	</faihooktabs>
 
 	<faivariabletabs>
-			<tab class="faiVariable" name="Variables" />
+		<tab class="faiVariable" name="Variables" />
 	</faivariabletabs>
 
 	<faitemplatetabs>
-			<tab class="faiTemplate" name="Templates" />
+		<tab class="faiTemplate" name="Templates" />
 	</faitemplatetabs>
 
 	<faiprofiletabs>
-			<tab class="faiProfile" name="Profiles" />
-	<!--	<tab class="faiSummaryTab" name="Summary" />-->
+		<tab class="faiProfile" name="Profiles" />
+		<tab class="faiSummaryTab" name="Summary" />
 	</faiprofiletabs>
 
 	<faipackagetabs>
-			<tab class="faiPackage" name="Packages" />
+		<tab class="faiPackage" name="Packages" />
 	</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="" 
@@ -248,7 +252,7 @@
 		smbhash='{SMBHASH}'
 		session_lifetime="7200"
 		schema_check="true"
-	    max_ldap_query_time="5.0"
+		max_ldap_query_time="5.0"
 		displayerros="{errorlvl}">
 
 		<location name="{LOCATIONNAME}"
@@ -261,9 +265,10 @@
 			hash="{CRYPT}"
 			dnmode="{DNMODE}"
 			server="{LDAPHOST}"
+			enable_snapshot="false"
+			snapshot_base="ou=snapshots,{LDAPBASE}"
 			config="ou=gosa,ou=configs,ou=systems,{LDAPBASE}">
 
-
 			<referral url="{LDAPHOST}/{LDAPBASE}"
 				admin="{LDAPADMIN}"
 				password="{PASSWORD}" />