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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 6ebd81c10..36cfae92e 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -2,62 +2,85 @@
 <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"
-				kioskpath="/var/spool/kiosk"
+			<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="users/netatalk" class="netatalk" icon="netatalk.png"
+				path="plugins/personal/netatalk" />
+{else}
+<!--
 			<plugin acl="default" class="netatalk" icon="netatalk.png"
 				path="plugins/personal/netatalk" />
-			<plugin acl="default" class="connectivity" icon="proxy.png"
+-->
+{/if}
+			<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="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="fai" class="faiManagement" icon="fai.png" 
+				path="plugins/admin/fai" />
+{else}
+<!--
 			<plugin acl="FAIclass" class="faiManagement" icon="fai.png" 
-				postcreate="" 
-                postremove="" 
 				path="plugins/admin/fai" />
-			<plugin acl="blocklists" class="blocklist" icon="blocklists.png"
+-->
+{/if}
+			<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" />
 		</section>
 
 		<section name="Addons">
@@ -73,21 +96,45 @@
 				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" />
+			<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"
+				storage_file="{$cv.optional.gotomasses_file}"
+				path="plugins/addons/gotomasses" />
+{else}
+<!--
+			<plugin acl="gotomasses" class="gotomasses" icon="system.png"
+				path="plugins/addons/gotomasses" />
+-->
+{/if}
+
 		</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" /> 
 -->
@@ -124,14 +171,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" />
+		<tab class="ServerService" name="Services" />
+{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>
@@ -140,54 +203,65 @@
 		<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" />
-    </phonetabs>
+	<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" />
+		<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" />
-    </serverservice>
-
-    <componenttabs>
-    	<tab class="componentgeneric" name="Generic" />
-    </componenttabs>
-
-    <wintabs>
-    	<tab class="wingeneric" name="Generic" />
-    </wintabs>
-
-    <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}
@@ -197,14 +271,13 @@
 		<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>
 
@@ -215,6 +288,37 @@
 		<tab class="csvimport" name="CSV Import" />
 	</ldiftab>
 
+{if $cv.enableFAI_management}
+	<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>
+{else}
+<!-- 
 	<faipartitiontabs>
 		<tab class="faiPartitionTable" name="Partitions" />
 	</faipartitiontabs>
@@ -243,9 +347,20 @@
 	<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}
@@ -253,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"
@@ -265,10 +380,10 @@
 {else}
 		schema_check="false"
 {/if}
-{if $cv.optional.enableCopyPaste}
-		enableCopyPaste="true" 
+{if $cv.generic_settings.enableCopyPaste}
+		enableCopyPaste="true"
 {else}
-		enableCopyPaste="false" 
+		enableCopyPaste="false"
 {/if}
 {if $cv.optional.forceglobals}
 		forceglobals="true"
@@ -280,6 +395,11 @@
 {else}
 		forcessl="false"
 {/if}
+{if $cv.optional.ldapstats}
+		ldapstats="true"
+{else}
+		ldapstats="false"
+{/if}
 {if $cv.optional.warnssl}
 		warnssl="true"
 {else}
@@ -288,9 +408,6 @@
 {if $cv.optional.ppd_path_active}
 		ppd_path="{$cv.optional.ppd_path}"
 {/if}
-{if $cv.optional.kde_applications_menu_active}
-		kde_applications_menu="{$cv.optional.kde_applications_menu}"
-{/if}
 {if $cv.optional.max_ldap_query_time_active}	
 		max_ldap_query_time="{$cv.optional.max_ldap_query_time}"
 {/if}
@@ -303,12 +420,22 @@
 {if $cv.optional.auto_network_hook_active}
 		auto_network_hook="{$cv.optional.auto_network_hook} "
 {/if}
-		lang="{$cv.lang}"
+{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}"
 		session_lifetime="{$cv.optional.session_lifetime}"
 		compile="{$cv.optional.compile}"
 		debuglevel="{$cv.optional.debuglevel}"
-		smbhash='{$cv.optional.smbhash}'
+		smbhash='{$cv.samba_settings.smbhash}'
 		>
 
 		<location name="{$cv.location}"
@@ -319,6 +446,29 @@
 			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}
+			krbsasl="false"
+{/if}
+{if $cv.rfc2307bis}
+			rfc2307bis="true"
+{else}
+			rfc2307bis="false"
+{/if}
+{if $cv.include_personal_title}
+			include_personal_title="true"
+{else}
+			include_personal_title="false"
+{/if}
 {if $cv.optional.notifydir_active }
 			notifydir="{$cv.optional.notifydir}"
 {/if}
@@ -328,16 +478,16 @@
 {if $cv.generic_settings.wws_ou_active}
 			winstations="{$cv.generic_settings.wws_ou}"
 {/if}
-{if $cv.generic_settings.idgen_active}
-			idgen="{$cv.generic_settings.idgen}"
+{if $cv.id_settings.idgen_active}
+			idgen="{$cv.id_settings.idgen}"
 {/if}
 {if $cv.strict}
 			strict="yes"
 {else}
 			strict="no"
 {/if}
-{if $cv.generic_settings.minid_active}
-			minid="{$cv.generic_settings.minid}"
+{if $cv.id_settings.minid_active}
+			minid="{$cv.id_settings.minid}"
 {/if}
 {if $cv.mail != "disabled"}
 			mailMethod="{$cv.mail}"
@@ -375,9 +525,6 @@
 {if $cv.generic_settings.snapshot_base != ""}
 			snapshot_base="{$cv.generic_settings.snapshot_base}"
 {/if}
-{if $cv.generic_settings.snapshot_ldap_base != ""}
-			snapshot_ldap_base="{$cv.generic_settings.snapshot_ldap_base}"
-{/if}
 {if $cv.generic_settings.snapshot_user != ""}
 			snapshot_user="{$cv.generic_settings.snapshot_user}"
 {/if}
@@ -398,15 +545,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" />