X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fgosa.conf;h=36cfae92e629891a073dc27e789e5eb24e6c8b68;hb=10b389ce61e35c2321db72a41678d0950677fd2f;hp=5da552ad44e5b8ca3889d9b3e2ce6fb74e9fbca5;hpb=28fbf482ba804dcca7362ae73370d0a3ce7b0e80;p=gosa.git

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 5da552ad4..36cfae92e 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -2,21 +2,21 @@
 <conf>
 	<menu>
 		<section name="My account">
-			<plugin acl="default" class="user" icon="personal.png"
+			<plugin acl="users/generic" class="user" icon="personal.png"
 				path="plugins/personal/generic" />
-			<plugin acl="default" class="posixAccount" icon="posix.png"
+			<plugin acl="users/posixAccount" class="posixAccount" icon="posix.png"
 				path="plugins/personal/posix" />
-			<plugin acl="default" class="environment" icon="env.png"
+			<plugin acl="users/environment" class="environment" icon="env.png"
 {if $cv.optional.kioskpath_active}
 				kioskpath="{$cv.optional.kioskpath}"
 {/if}
 				path="plugins/personal/environment" />
-			<plugin acl="default" class="mailAccount" icon="email.png"
+			<plugin acl="users/mailAccount" class="mailAccount" icon="email.png"
 				path="plugins/personal/mail" />
-			<plugin acl="default" class="sambaAccount" icon="samba.png"
+			<plugin acl="users/sambaAccount" class="sambaAccount" icon="samba.png"
 				path="plugins/personal/samba" />
 {if $cv.use_netatalk}
-			<plugin acl="default" class="netatalk" icon="netatalk.png"
+			<plugin acl="users/netatalk" class="netatalk" icon="netatalk.png"
 				path="plugins/personal/netatalk" />
 {else}
 <!--
@@ -24,46 +24,48 @@
 				path="plugins/personal/netatalk" />
 -->
 {/if}
-			<plugin acl="default" class="connectivity" icon="proxy.png"
+			<plugin acl="users/connectivity" class="connectivity" icon="proxy.png"
 				path="plugins/personal/connectivity" />
-			<plugin acl="default" class="gofaxAccount" icon="fax.png"
+			<plugin acl="users/gofaxAccount" class="gofaxAccount" icon="fax.png"
 				path="plugins/gofax/faxaccount" />
-			<plugin acl="default" class="phoneAccount" icon="phone.png"
+			<plugin acl="users/phoneAccount" 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" /> 
+			<plugin acl="users/nagiosAccount" class="nagiosAccount" icon="monitoring.png"
+				path="plugins/personal/nagios" />
 -->
-			<plugin acl="default" class="password" icon="password.png"
+			<plugin acl="users/password" class="password" icon="password.png"
 				path="plugins/personal/password" />
 		</section>
 		
 		<section name="Administration">
-			<plugin acl="user" class="userManagement" icon="user.png"
+			<plugin acl="users" class="userManagement" icon="user.png"
 				path="plugins/admin/users" />
-			<plugin acl="group" class="groupManagement" icon="group.png"
+			<plugin acl="groups" class="groupManagement" icon="group.png"
 				path="plugins/admin/groups" />
-			<plugin acl="ogroup" class="ogroupManagement" icon="ogroup.png"
+			<plugin acl="ogroups" class="ogroupManagement" icon="ogroup.png"
 				path="plugins/admin/ogroups" />
 			<plugin acl="department" class="departmentManagement" icon="department.png"
 				path="plugins/admin/departments" />
 			<plugin acl="application" class="applicationManagement"
 				icon="application.png" path="plugins/admin/applications" />
-			<plugin acl="systems" class="systems" icon="system.png"
+			<plugin acl="terminal,workstation,server,phone,printer,component,winworkstation" class="systems" icon="system.png"
 				path="plugins/admin/systems" />
+{if $cv.enableMimeType}
+			<plugin acl="mimetypes" class="mimetypeManagement"
+				icon="mimetypes.png" path="plugins/admin/mimetypes" />
+{else}
+<!--
 			<plugin acl="mimetype" class="mimetypeManagement"
 				icon="mimetypes.png" path="plugins/admin/mimetypes" />
-
+-->
+{/if}
 			<!-- Use 'lock_dn'      for dn
-                     'lock_name'    for name
-                     'lock_type'    for branch/freeze -->
+				'lock_name'    for name
+				'lock_type'    for branch/freeze -->
 
 {if $cv.enableFAI_management}
-			<plugin acl="FAIclass" class="faiManagement" icon="fai.png" 
+			<plugin acl="fai" class="faiManagement" icon="fai.png" 
 				path="plugins/admin/fai" />
 {else}
 <!--
@@ -71,14 +73,14 @@
 				path="plugins/admin/fai" />
 -->
 {/if}
-			<plugin acl="blocklists" class="blocklist" icon="blocklists.png"
+			<plugin acl="gofaxlist" class="blocklist" icon="blocklists.png"
 				path="plugins/gofax/blocklists" />
-			<plugin acl="goFonMacro" class="gofonMacro" icon="macros.png"
+			<plugin acl="gofonmacro" class="goFonMacro" icon="macros.png"
 				path="plugins/gofon/macro" />
-			<plugin acl="conference" class="phoneConferenceManagment" icon="conference.png"
+			<plugin acl="gofonconference" class="phoneConferenceManagment" icon="conference.png"
 				path="plugins/gofon/conference" />
-            <plugin acl="acl" class="acl" icon="acl.png"
-                path="plugins/admin/acl" />
+			<plugin acl="acl" class="acl" icon="acl.png"
+				path="plugins/admin/acl" />
 		</section>
 
 		<section name="Addons">
@@ -94,11 +96,12 @@
 				path="plugins/addons/mailqueue" />
 			<plugin acl="ldapmanager" class="ldif" icon="ldif.png"
 				path="plugins/addons/ldapmanager" />
-			<plugin acl="notifications" class="msgplug" icon="notifications.png"
+			<plugin acl="msgplug" class="msgplug" icon="notifications.png"
 				path="plugins/addons/notifications" />
 {if $cv.optional.gotomasses_active}
 			<plugin acl="gotomasses" class="gotomasses" icon="system.png"
-				path="{$cv.optional.gotomasses_file}" />
+				storage_file="{$cv.optional.gotomasses_file}"
+				path="plugins/addons/gotomasses" />
 {else}
 <!--
 			<plugin acl="gotomasses" class="gotomasses" icon="system.png"
@@ -109,9 +112,9 @@
 		</section>
 	</menu>
 
-    <aclroletab>
-        <tab class="aclRole" name="ACL Role" />
-    </aclroletab>
+	<aclroletab>
+		<tab class="aclRole" name="ACL Role" />
+	</aclroletab>
 
 	<usertabs>
 		<tab class="user" name="Generic" />
@@ -130,7 +133,7 @@
 		<tab class="gofaxAccount" name="Fax" />
 		<tab class="phoneAccount" name="Phone" />
 <!--
-        <tab class="scalixAccount" name="Scalix" />
+		<tab class="scalixAccount" name="Scalix" />
 -->
 <!--            
 		<tab class="nagiosAccount" name="Nagios" /> 
@@ -174,7 +177,7 @@
 	<servtabs>
 		<tab class="servgeneric" name="Generic" />
 		<tab class="workstartup" name="Startup" />
-		<tab class="serverService" name="Services" />
+		<tab class="ServerService" name="Services" />
 {if $cv.enableFAI_management}
 	    <tab class="faiSummaryTab" name="FAI summary" />
 {else}
@@ -213,52 +216,52 @@
 		<tab class="glpiPrinterAccount" name="Inventory" />
 	</printtabs>
 
-    <phonetabs>
-        <tab class="phonegeneric" name="Generic" />
+	<phonetabs>
+		<tab class="phoneGeneric" name="Generic" />
 		<tab class="glpiAccount" name="Inventory" />
-    </phonetabs>
+	</phonetabs>
 
-    <componenttabs>
-    	<tab class="componentgeneric" name="Generic" />
+	<componenttabs>
+		<tab class="componentgeneric" name="Generic" />
 		<tab class="glpiAccount" name="Inventory" />
-    </componenttabs>
+	</componenttabs>
 
-    <wintabs>
-    	<tab class="wingeneric" name="Generic" />
+	<wintabs>
+		<tab class="wingeneric" name="Generic" />
 		<tab class="glpiAccount" name="Inventory" />
-    </wintabs>
+	</wintabs>
 
 	<serverservice>
-        <tab class="goMailServer" />
+		<tab class="goMailServer" />
 {if $cv.mail == "kolab"}
 		<tab class="servkolab" />
 {/if}
-        <tab class="goNtpServer" />
+		<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" />
-        <tab class="servdns" />
-        <tab class="gosaLogServer" />
-    </serverservice>
-
-    <deptabs>
-    	<tab class="department" name="Generic" />
-    </deptabs>
-
-    <ogrouptabs>
-    	<tab class="ogroup" name="Generic" />
-    </ogrouptabs>
-
-    <connectivity>
+		<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" />
+		<tab class="servdns" />
+		<tab class="gosaLogServer" />
+	</serverservice>
+
+	<deptabs>
+		<tab class="department" name="Generic" />
+	</deptabs>
+
+	<ogrouptabs>
+		<tab class="ogroup" name="Generic" />
+	</ogrouptabs>
+
+	<connectivity>
 {if $cv.mail == "kolab"}
 		<tab class='kolabAccount' /> 
 {/if}
@@ -268,15 +271,14 @@
 		<tab class="phpgwAccount" />
 		<tab class="intranetAccount" />
 		<tab class="opengwAccount"
-             username="OGo"
-             password=""
-             database="OGo"
-             datahost="localhost" />
+			username="OGo"
+			password=""
+			database="OGo"
+			datahost="localhost" />
 <!--	
 		<tab class="pptpAccount" /> 
 		<tab class="phpscheduleitAccount" /> 
 -->
-		<tab class="glpiAccount" /> 
 	</connectivity>
 
 	<ldiftab>
@@ -366,7 +368,7 @@
 		pwdiffer="{$cv.pwd_rules.pwdiffer}"
 {/if}
 {if $cv.pwd_rules.externalpwdhook_active}
-		pwdiffer="{$cv.pwd_rules.externalpwdhook}"
+		externalpwdhook="{$cv.pwd_rules.externalpwdhook}"
 {/if}
 {if $cv.errorlvl}
 		displayerrors="true"
@@ -417,6 +419,16 @@
 {/if}
 {if $cv.optional.auto_network_hook_active}
 		auto_network_hook="{$cv.optional.auto_network_hook} "
+{/if}
+{if $cv.optional.user_filter_cookie}
+		save_filter="true"
+{else}
+		save_filter="false"
+{/if}
+{if $cv.compressed}
+		compressed="true"
+{else}
+		compressed="false"
 {/if}
 		lang="{$cv.lang_selected}"
 		theme="{$cv.theme}"