X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fcontrib%2Fgosa.conf;h=84b0765f38ed88d6b502a2fd12f37b5ecf8dabbb;hb=adb9134e00c4bd3c42ac4ec453b80595787f79fb;hp=18fb22802b347598fb3075797e21a4083a3ffba7;hpb=a2f9f7e7a9d45f8a8cc8d7026c617f1a4b896a64;p=gosa.git

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 18fb22802..84b0765f3 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -1,119 +1,76 @@
 {literal}<?xml version="1.0"?>{/literal}
-<conf>
+<conf config_version="{$config_checksum}" >
 	<menu>
 		<section name="My account">
-			<plugin acl="users/generic" class="user" icon="personal.png"
-				path="plugins/personal/generic" />
-			<plugin acl="users/posixAccount" class="posixAccount" icon="posix.png"
-				path="plugins/personal/posix" />
-			<plugin acl="users/environment" class="environment" icon="env.png"
+			<plugin acl="users/generic:self" class="user" />
+			<plugin acl="users/posixAccount:self" class="posixAccount" icon="posix.png" />
+			<plugin acl="users/environment:self" class="environment" icon="env.png"
 {if $cv.optional.kioskpath_active}
 				kioskpath="{$cv.optional.kioskpath}"
 {/if}
-				path="plugins/personal/environment" />
-			<plugin acl="users/mailAccount" class="mailAccount" icon="email.png"
-				path="plugins/personal/mail" />
-			<plugin acl="users/sambaAccount" class="sambaAccount" icon="samba.png"
-				path="plugins/personal/samba" />
+				 />
+			<plugin acl="users/mailAccount:self" class="mailAccount" icon="email.png" />
+			<plugin acl="users/sambaAccount:self" class="sambaAccount" icon="samba.png" />
 {if $cv.use_netatalk}
-			<plugin acl="users/netatalk" class="netatalk" icon="netatalk.png"
-				path="plugins/personal/netatalk" />
+			<plugin acl="users/netatalk:self" class="netatalk" icon="netatalk.png" />
 {else}
 <!--
-			<plugin acl="default" class="netatalk" icon="netatalk.png"
-				path="plugins/personal/netatalk" />
+			<plugin acl="users/netatalk:self" class="netatalk" icon="netatalk.png" />
 -->
 {/if}
-			<plugin acl="users/connectivity" class="connectivity" icon="proxy.png"
-				path="plugins/personal/connectivity" />
-			<plugin acl="users/gofaxAccount" class="gofaxAccount" icon="fax.png"
-				path="plugins/gofax/faxaccount" />
-			<plugin acl="users/phoneAccount" class="phoneAccount" icon="phone.png"
-				path="plugins/gofon/phoneaccount" />
+			<plugin acl="users/connectivity:self" class="connectivity" icon="proxy.png" />
+			<plugin acl="users/gofaxAccount:self" class="gofaxAccount" icon="fax.png" />
+			<plugin acl="users/phoneAccount:self" class="phoneAccount" icon="phone.png" />
 <!--
-			<plugin acl="users/nagiosAccount" class="nagiosAccount" icon="monitoring.png"
-				path="plugins/personal/nagios" />
+			<plugin acl="users/nagiosAccount:self" class="nagiosAccount" icon="monitoring.png" />
 -->
-			<plugin acl="users/password" class="password" icon="password.png"
-				path="plugins/personal/password" />
+			<plugin acl="users/password:self" class="password" icon="password.png" />
 		</section>
 		
 		<section name="Administration">
-			<plugin acl="users" class="userManagement" icon="user.png"
-				path="plugins/admin/users" />
-			<plugin acl="groups" class="groupManagement" icon="group.png"
-				path="plugins/admin/groups" />
-			<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="terminal,workstation,server,phone,printer,component,winworkstation" class="systems" icon="system.png"
-				path="plugins/admin/systems" />
+			<plugin acl="department" class="departmentManagement"  />
+			<plugin acl="users" class="userManagement" icon="user.png" />
+			<plugin acl="groups" class="groupManagement" />
+			<plugin acl="ogroups" class="ogroupManagement" />
+			<plugin acl="application" class="applicationManagement" icon="application.png" />
 {if $cv.enableMimeType}
-			<plugin acl="mimetypes" class="mimetypeManagement"
-				icon="mimetypes.png" path="plugins/admin/mimetypes" />
+			<plugin acl="mimetypes" class="mimetypeManagement" icon="mimetypes.png" />
 {else}
 <!--
-			<plugin acl="mimetype" class="mimetypeManagement"
-				icon="mimetypes.png" path="plugins/admin/mimetypes" />
+			<plugin acl="mimetype" class="mimetypeManagement" icon="mimetypes.png" />
 -->
 {/if}
 			<plugin acl="devices" class="deviceManagement"
-				icon="devices.png" path="plugins/admin/devices" />
-
+				icon="devices.png" />
+			<plugin acl="terminal,workstation,server,phone,printer,component,winworkstation" class="systems" icon="system.png" />
 			<!-- Use 'lock_dn'      for dn
 				'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" />
+			<plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiiPackage,fai/faiProfile" class="faiManagement" icon="fai.png" />
 {else}
 <!--
-			<plugin acl="FAIclass" class="faiManagement" icon="fai.png" 
-				path="plugins/admin/fai" />
+			<plugin acl="fai" class="faiManagement" icon="fai.png" />
 -->
 {/if}
-			<plugin acl="gofaxlist" class="blocklist" icon="blocklists.png"
-				path="plugins/gofax/blocklists" />
-			<plugin acl="gofonmacro" class="goFonMacro" icon="macros.png"
-				path="plugins/gofon/macro" />
-			<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="gofaxlist" class="blocklist" icon="blocklists.png" />
+			<plugin acl="gofonmacro" class="goFonMacro" icon="macros.png" />
+			<plugin acl="gofonconference" class="phoneConferenceManagment" icon="conference.png" />
+			<plugin acl="acl" class="aclManagement" />
+			<plugin acl="sudo" class="sudoManagement" icon="sudo.png" />
 		</section>
 
 		<section name="Addons">
-			<plugin acl="addressbook" class="addressbook" icon="addressbook.png"
-				path="plugins/addons/addressbook" />
-			<plugin acl="faxreport" class="faxreport" icon="reports.png"
-				path="plugins/gofax/faxreports" />
-			<plugin acl="fonreport" class="fonreport" icon="phonereport.png"
-				path="plugins/gofon/fonreports" />
-			<plugin acl="logview" class="logview" icon="logview.png"
-				path="plugins/addons/logview" />
-			<plugin acl="mailqueue" class="mailqueue" icon="mailqueue.png"
-				path="plugins/addons/mailqueue" />
-			<plugin acl="ldapmanager" class="ldif" icon="ldif.png"
-				path="plugins/addons/ldapmanager" />
-			<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}
 <!--
-			<plugin acl="all" class="bugsubmitter" icon="bugsubmitter.png"
-				path="plugins/addons/bugsubmitter" />
+			<plugin acl="server/servservrepository,server/dakrepository,server/dakkeyring,server/dakqueue" class="dak_tabs" path="plugins/addons/dak" />
 -->
+			<plugin acl="addressbook" class="addressbook" icon="addressbook.png" />
+			<plugin acl="mailqueue" class="mailqueue" icon="mailqueue.png" />
+			<plugin acl="faxreport" class="faxreport" icon="reports.png" />
+			<plugin acl="fonreport" class="fonreport" icon="phonereport.png" />
+			<plugin acl="logview" class="logview" icon="logview.png" />
+			<plugin acl="gotomasses" class="gotomasses" icon="queue.png" />
+			<plugin acl="ldapmanager" class="ldif" icon="ldif.png" />
 		</section>
 	</menu>
 
@@ -121,6 +78,11 @@
 		<tab class="aclRole" name="ACL Role" />
 	</aclroletab>
 
+	<sudotabs>
+		<tab class="sudo" name="Generic" />
+		<tab class="sudoOption" name="Options" />
+	</sudotabs>
+
 	<usertabs>
 		<tab class="user" name="Generic" />
 		<tab class="posixAccount" name="Unix" />
@@ -186,7 +148,7 @@
 		<tab class="printgeneric" name="Printer" />
 		<tab class="terminfo" name="Information" 
 			snmpcommunity="{$cv.optional.snmpcommunity}" />
-		<tab class="glpiAccount" name="Inventory" />
+<!--		<tab class="glpiAccount" name="Inventory" /> -->
 	</termtabs>
 
 	<servtabs>
@@ -194,13 +156,15 @@
 		<tab class="workstartup" name="Startup" />
 		<tab class="ServerService" name="Services" />
 {if $cv.enableFAI_management}
-	    <tab class="faiSummaryTab" name="FAI summary" />
+		<tab class="faiSummaryTab" name="Deployment summary" />
+		<tab class="goto_log_view" name="Installation logs" />
 {else}
-<!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
+<!--  <tab class="faiSummaryTab" name="Deployment summary" /> -->
+<!--	<tab class="goto_log_view" name="Installation logs" /> -->
 {/if}
 		<tab class="terminfo" name="Information" 
 			snmpcommunity="{$cv.optional.snmpcommunity}" />
-		<tab class="glpiAccount" name="Inventory" />
+<!--		<tab class="glpiAccount" name="Inventory" /> -->
 	</servtabs>
 
 	<worktabs>
@@ -211,31 +175,34 @@
 		<tab class="terminfo" name="Information" 
 			snmpcommunity="{$cv.optional.snmpcommunity}" />
 {if $cv.enableFAI_management}
-	    <tab class="faiSummaryTab" name="FAI summary" />
+		<tab class="faiSummaryTab" name="Deployment summary" />
+		<tab class="goto_log_view" name="Installation logs" />
 {else}
-<!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
+<!--	<tab class="faiSummaryTab" name="Deployment summary" /> -->
+<!--	<tab class="goto_log_view" name="Installation logs" /> -->
 {/if}
-		<tab class="glpiAccount" name="Inventory" />
+<!--		<tab class="glpiAccount" name="Inventory" /> -->
+	
 	</worktabs>
 
 	<printtabs>
 		<tab class="printgeneric" name="Generic" />
-		<tab class="glpiPrinterAccount" name="Inventory" />
+<!--		<tab class="glpiPrinterAccount" name="Inventory" /> -->
 	</printtabs>
 
 	<phonetabs>
 		<tab class="phoneGeneric" name="Generic" />
-		<tab class="glpiAccount" name="Inventory" />
+<!--		<tab class="glpiAccount" name="Inventory" /> -->
 	</phonetabs>
 
 	<componenttabs>
 		<tab class="componentGeneric" name="Generic" />
-		<tab class="glpiAccount" name="Inventory" />
+<!--		<tab class="glpiAccount" name="Inventory" /> -->
 	</componenttabs>
 
 	<wintabs>
 		<tab class="wingeneric" name="Generic" />
-		<tab class="glpiAccount" name="Inventory" />
+<!--		<tab class="glpiAccount" name="Inventory" /> -->
 	</wintabs>
 
 	<serverservice>
@@ -270,10 +237,34 @@
 		<tab class="department" name="Generic" />
 	</deptabs>
 
+	<organization_tabs>
+		<tab class="organization" name="Generic" />
+	</organization_tabs>
+
+	<locality_tabs>
+		<tab class="locality" name="Generic" />
+	</locality_tabs>
+
+	<country_tabs>
+		<tab class="country" name="Generic" />
+	</country_tabs>
+
+	<dcobject_tabs>
+		<tab class="dcObject" name="Generic" />
+	</dcobject_tabs>
+
 	<ogrouptabs>
 		<tab class="ogroup" name="Generic" />
 	</ogrouptabs>
 
+<!--
+	<dak_tabs>
+		<tab class="dakrepository" name="Repository" />
+		<tab class="dakqueue" name="Queue" />
+		<tab class="dakkeyring" name="Key ring" />
+	</dak_tabs>
+-->
+
 	<connectivity>
 {if $cv.mail == "kolab"}
 		<tab class='kolabAccount' /> 
@@ -283,11 +274,13 @@
 		<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" /> 
@@ -367,6 +360,11 @@
 -->
 {/if}
 
+	<sudotabs>
+		<tab class="sudo" name="Generic" />
+		<tab class="sudoOption" name="Options" />
+	</sudotabs>
+
 	<logtabs>
 			<tab class="logview" name="System logs" />
 			<tab class="gosa_logview" name="GOsa logs" />
@@ -468,10 +466,9 @@
 			groups="{$cv.groupou}"
 			gidbase="{$cv.uidbase}"
 			uidbase="{$cv.uidbase}"
-{if $cv.optional.sub_list_support}
-			sub_list_support="true"
-{else}
-			sub_list_support="false"
+			logging="{$cv.generic_settings.logging}"
+{if $cv.optional.sudoou_active}
+			sudoou="{$cv.optional.sudoou}"
 {/if}
 {if $cv.optional.login_attribute}
 			login_attribute="{$cv.optional.login_attribute}"