[debian-edu-commits] debian-edu/ 01/01: Cleanup share/debian-edu-config/gosa.conf.template

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit ed8a03e9b23b6a9175ab50d041dcd9f08b7b3206
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Mar 11 12:51:55 2018 +0100

    Cleanup share/debian-edu-config/gosa.conf.template
    
    Remove opsi and fai items; the related packages gosa-plugin-opsi and
    gosa-plugin-fai are no longer available.
---
 debian/changelog                           |  6 ++++
 share/debian-edu-config/gosa.conf.template | 50 +-----------------------------
 2 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f905aa8..02689d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 debian-edu-config (2.10.24) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * postinst: instead of testing with [ -x /usr/bin/etckeeper ] use
     "which etckeeper" and drop lintian.overrides for
     command-with-path-in-maintainer-script. Thanks lintian.
 
+  [ Wolfgang Schweer ]
+  * Cleanup share/debian-edu-config/gosa.conf.template:
+    - Remove opsi and fai items; the related packages gosa-plugin-opsi and
+      gosa-plugin-fai are no longer available.
+
  -- Holger Levsen <holger at debian.org>  Fri, 16 Feb 2018 10:57:40 +0000
 
 debian-edu-config (2.10.23) unstable; urgency=medium
diff --git a/share/debian-edu-config/gosa.conf.template b/share/debian-edu-config/gosa.conf.template
index 7ac2cdf..dd59a93 100644
--- a/share/debian-edu-config/gosa.conf.template
+++ b/share/debian-edu-config/gosa.conf.template
@@ -45,12 +45,10 @@
       <plugin acl="ogroups" class="ogroupManagement" />
       <plugin acl="sudo" class="sudoManagement" />
       <plugin acl="netgroup" class="netgroupManagement" />
-      <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric,opsi/opsiGeneric" class="systemManagement" />
+      <plugin acl="terminal/termgeneric,workstation/workgeneric,server/servgeneric,phone/phoneGeneric,printer/printgeneric,component/componentGeneric,winworkstation/wingeneric" class="systemManagement" />
       <!-- Use 'lockDn'      for dn
                'lockName'    for name
                'lockType'    for branch/freeze -->
-      <plugin acl="fai/faiScript,fai/faiHook,fai/faiTemplate,fai/faiVariable,fai/faiPartitionTable,fai/faiPackage,fai/faiProfile,fai/faiManagement,opsi/opsiProperties" class="faiManagement" />
-      <plugin acl="opsi" class="opsiLicenses"/>
       <plugin acl="gofaxlist" class="blocklist" />
       <plugin acl="gofonmacro" class="goFonMacro" />
       <plugin acl="gofonconference" class="phoneConferenceManagment" />
@@ -128,11 +126,6 @@
      <tab class="posixAccount" name="POSIX" />
    </MyAccountTabs>
 
-  <opsiLicenseTabs>
-    <tab class="licensePoolGeneric" name="Generic" />
-    <tab class="licenseUsage" name="Usage" />
-  </opsiLicenseTabs>
-
   <!-- Group dialog -->
   <grouptabs>
     <tab class="group" name="Generic" />
@@ -321,47 +314,6 @@
     <tab class="managepws" name="Reset Passwords" />
   </pwresettab>
 
-  <faipartitiontabs>
-    <tab class="faiPartitionTable" name="Partitions" />
-  </faipartitiontabs>
-
-  <faiscripttabs>
-    <tab class="faiScript" name="Scripts" />
-  </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>
-
-  <opsitabs>
-    <tab class="opsiGeneric" name="Generic" />
-    <tab class="opsiSoftware" name="Hardware" />
-    <tab class="opsiHardware" name="Software" />
-    <tab class="licenseUsageByHost" name="License usage" />
-  </opsitabs>
-
-  <opsiprodconfig>
-    <tab class="opsiProperties" name="Properties" />
-    <tab class="licenseByProduct" name="License usage" />
-  </opsiprodconfig>
-
   <!-- rSyslog plugin -->
   <rsyslogtabs>
       <tab class="rsyslog" name="System logs" />

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git