Updated setup

[gosa.git] / gosa-core / contrib / gosa.conf

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 22f377f14c0634d8b258a95b63852527b4743000..a16b8598d0b77cb8494a362a84141a33e3ded91d 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -43,6 +43,8 @@
                                path="plugins/admin/users" />
                        <plugin acl="groups" class="groupManagement" icon="group.png"
                                path="plugins/admin/groups" />
+                       <plugin acl="sudo" class="sudoManagement" icon="sudo.png"
+                               path="plugins/admin/sudo" />
                        <plugin acl="ogroups" class="ogroupManagement" icon="ogroup.png"
                                path="plugins/admin/ogroups" />
                        <plugin acl="department" class="departmentManagement" icon="department.png"
@@ -98,18 +100,8 @@
                                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" />
@@ -194,9 +186,9 @@
                <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" />
 {else}
-<!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
+<!--    <tab class="faiSummaryTab" name="Deployment summary" /> -->
 {/if}
                <tab class="terminfo" name="Information" 
                        snmpcommunity="{$cv.optional.snmpcommunity}" />
@@ -211,9 +203,9 @@
                <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" />
 {else}
-<!--    <tab class="faiSummaryTab" name="FAI summary" /> -->
+<!--    <tab class="faiSummaryTab" name="Deployment summary" /> -->
 {/if}
                <tab class="glpiAccount" name="Inventory" />
        </worktabs>
@@ -301,6 +293,10 @@
                <tab class="csvimport" name="CSV Import" />
        </ldiftab>
 
+        <arpnewdevicetabs>
+                <tab class="ArpNewDevice" name="Generic" />
+        </arpnewdevicetabs>
+
 {if $cv.enableFAI_management}
        <faipartitiontabs>
                <tab class="faiPartitionTable" name="Partitions" />
@@ -363,6 +359,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" />
@@ -464,10 +465,8 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
-{if $cv.optional.sub_list_support}
-                       sub_list_support="true"
-{else}
-                       sub_list_support="false"
+{if $cv.optional.sudoou_active}
+                       sudoou="{$cv.optional.sudoou}"
 {/if}
 {if $cv.optional.login_attribute}
                        login_attribute="{$cv.optional.login_attribute}"
@@ -524,6 +523,7 @@
 {else}
                        cyrusunixstyle="false"
 {/if}
+                       mail_uattrib="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
                        vacationdir="{$cv.mail_settings.vacationdir}"
 {/if}