[debian-edu-commits] [Git][debian-edu/debian-edu][master] 5 commits: tasks/main-server: Replace icinga2-classicui with icingaweb2.

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu


Commits:
e52c8f5c by Wolfgang Schweer at 2019-10-30T09:30:20Z
tasks/main-server: Replace icinga2-classicui with icingaweb2.

The icinga2-classicui package is no longer available (removed together with
icinga 1). Integrating icingaweb2 is supposed to require quite a lot of work.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
5c837422 by Wolfgang Schweer at 2019-10-30T09:37:04Z
tasks/main-server:
 - Replace debian-installer-10-netboot-{amd64,i386} with
   Replace debian-installer-11-netboot-{amd64,i386}.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
4ba0c6cf by Wolfgang Schweer at 2019-10-30T09:47:23Z
tasks/ltsp-server: Drop Recommends on ltsp-docs which is no longer available.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
4ec6c467 by Wolfgang Schweer at 2019-10-30T09:52:54Z
d/control: Update after running 'make dist'.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
9530afd7 by Wolfgang Schweer at 2019-10-30T09:53:43Z
Add changelog entries for last commits.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


4 changed files:

- debian/changelog
- debian/control
- tasks/ltsp-server
- tasks/main-server


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,14 @@
 debian-edu (2.11.5) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
+  * debian/control: Update after running 'make dist'.
+
+  [ Wolfgang Schweer ]
+  * tasks/main-server:
+    - Replace icinga2-classicui with icingaweb2.
+    - Replace debian-installer-10-netboot-{amd64,i386} with
+      debian-installer-11-netboot-{amd64,i386}.
+  * tasks/ltsp-server: Drop Recommends on ltsp-docs (no longer available).
   * debian/control: Update after running 'make dist'.
 
  -- Holger Levsen <holger at debian.org>  Tue, 29 Oct 2019 11:45:36 +0100


=====================================
debian/control
=====================================
@@ -675,7 +675,6 @@ Recommends: education-workstation,
             tightvncserver,
             x2goserver,
             xrdp
-Suggests: ltsp-docs
 Description: Debian Edu LTSP server packages
  A metapackage containing dependencies for packages required on all
  LTSP server installations in the Debian Edu Blend.
@@ -687,8 +686,6 @@ Depends: ${misc:Depends},
          education-tasks (= ${binary:Version})
 Recommends: apache2,
             bind9,
-            debian-installer-10-netboot-amd64,
-            debian-installer-10-netboot-i386,
             dovecot-gssapi,
             dovecot-imapd,
             education-networked,
@@ -711,6 +708,7 @@ Recommends: apache2,
             gosa-plugin-sudo-schema,
             gosa-schema,
             icinga2,
+            icingaweb2,
             iptables,
             isc-dhcp-server-ldap,
             krb5-admin-server,
@@ -744,12 +742,13 @@ Recommends: apache2,
             tftpd-hpa
 Suggests: apache2-doc,
           calamaris,
+          debian-installer-11-netboot-amd64,
+          debian-installer-11-netboot-i386,
           default-mysql-client,
           dlint,
           dnswalk,
           dovecot-pop3d,
           dsh,
-          icinga2-classicui,
           krb5-doc,
           libsasl2-modules-ldap,
           nslint,


=====================================
tasks/ltsp-server
=====================================
@@ -24,9 +24,6 @@ Recommends:
  ldm-server,
 NeedConfig: yes
 
-Recommends:
- ltsp-docs,
-
 Recommends:
  rdiff-backup,
 


=====================================
tasks/main-server
=====================================
@@ -33,8 +33,8 @@ Recommends:
  isc-dhcp-server-ldap,
  pxelinux,
  syslinux-common,
- debian-installer-10-netboot-i386,
- debian-installer-10-netboot-amd64,
+ debian-installer-11-netboot-i386,
+ debian-installer-11-netboot-amd64,
  tftpd-hpa,
 NeedConfig: yes - set local IP range, DNS name and default routing
 
@@ -114,7 +114,7 @@ NeedConfig: yes - done automatically by preseeding sitesummary
 
 Recommends:
  icinga2,
- icinga2-classicui,
+ icingaweb2,
  monitoring-plugins-standard,
  nagios-nrpe-plugin,
 NeedConfig: yes - done via preseeding: icingaadmin password, enable cgi.



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/e7b71534cba35ea27b6c4825d2dfdd8e5bcc42a5...9530afd70cd37b8d96571c6e81f29edb3c87bd16

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/e7b71534cba35ea27b6c4825d2dfdd8e5bcc42a5...9530afd70cd37b8d96571c6e81f29edb3c87bd16
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20191030/857a2226/attachment-0001.html>