[debian-edu-commits] debian-edu/ 01/01: tasks/main-server: replace icinga2 with icinga, drop icinga2-classicui.

[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.

commit 56723eedd9a9b6c04b9c27e359a4aa58b29aecd1
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Jan 17 18:45:46 2017 +0100

    tasks/main-server: replace icinga2 with icinga, drop icinga2-classicui.
---
 debian-edu-tasks.desc | 13 ++++++-------
 debian/changelog      |  6 ++++++
 debian/control        |  7 +++----
 tasks/main-server     |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index 4d6cd00..3cd7a43 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -532,7 +532,6 @@ Packages: list
  ktuberling
  openshot
  kdenlive
- stopmotion
  gcompris
  inkscape
  libreoffice-l10n-el
@@ -672,6 +671,7 @@ Packages: list
  education-music
  audacity
  terminatorx
+ freebirth
  hydrogen
  solfege
  audacious
@@ -1376,7 +1376,6 @@ Packages: list
  ktuberling
  openshot
  kdenlive
- stopmotion
  gcompris
  inkscape
  libreoffice-l10n-el
@@ -1516,6 +1515,7 @@ Packages: list
  education-music
  audacity
  terminatorx
+ freebirth
  hydrogen
  solfege
  audacious
@@ -1703,8 +1703,7 @@ Packages: list
  slbackup
  slbackup-php
  munin
- icinga2
- icinga2-classicui
+ icinga
  monitoring-plugins-standard
  nagios-nrpe-plugin
  sitesummary
@@ -2116,7 +2115,6 @@ Packages: list
  ktuberling
  openshot
  kdenlive
- stopmotion
  gcompris
  inkscape
  libreoffice-l10n-el
@@ -2256,6 +2254,7 @@ Packages: list
  education-music
  audacity
  terminatorx
+ freebirth
  hydrogen
  solfege
  audacious
@@ -2422,7 +2421,6 @@ Packages: list
  ktuberling
  openshot
  kdenlive
- stopmotion
  gcompris
  inkscape
  libreoffice-l10n-el
@@ -2562,6 +2560,7 @@ Packages: list
  education-music
  audacity
  terminatorx
+ freebirth
  hydrogen
  solfege
  audacious
@@ -2767,7 +2766,6 @@ Packages: list
  ktuberling
  openshot
  kdenlive
- stopmotion
  gcompris
  inkscape
  libreoffice-l10n-el
@@ -2907,6 +2905,7 @@ Packages: list
  education-music
  audacity
  terminatorx
+ freebirth
  hydrogen
  solfege
  audacious
diff --git a/debian/changelog b/debian/changelog
index a7c6e14..b5175a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-edu (1.918) UNRELEASED; urgency=medium
+
+  * tasks/main-server: replace icinga2 with icinga, drop icinga2-classicui.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 17 Jan 2017 18:39:46 +0100
+
 debian-edu (1.917) unstable; urgency=medium
 
   [ Petter Reinholdtsen ]
diff --git a/debian/control b/debian/control
index 298515f..f737c73 100644
--- a/debian/control
+++ b/debian/control
@@ -468,7 +468,6 @@ Recommends: alsa-base,
  sane,
  sane-utils,
  skanlite,
- stopmotion,
  synaptic,
  tmispell-voikko,
  tuxmath,
@@ -613,6 +612,7 @@ Suggests: auctex,
  scim-tables-zh,
  smbclient,
  sql-ledger,
+ stopmotion,
  tablix2,
  texlive,
  texlive-doc-base,
@@ -1150,8 +1150,7 @@ Recommends: apache2,
  gosa-plugin-sudo,
  gosa-plugin-sudo-schema,
  gosa-schema,
- icinga2,
- icinga2-classicui,
+ icinga,
  iptables,
  isc-dhcp-server-ldap,
  krb5-admin-server,
@@ -1284,6 +1283,7 @@ Recommends: audacious,
  education-menus,
  fluid-soundfont-gm,
  fluidsynth,
+ freebirth,
  gtick,
  hydrogen,
  jackd,
@@ -1300,7 +1300,6 @@ Recommends: audacious,
 Suggests: beast,
  denemo,
  festival,
- freebirth,
  kguitar,
  lenmus,
  lilypond,
diff --git a/tasks/main-server b/tasks/main-server
index 9cb8ee2..4a68a01 100644
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -125,11 +125,11 @@ Why:         Needed to see what happens
 Responsible: Finn-Arne Johansen
 NeedConfig:  yes, done automatically by preseeding sitesummary
 
-Depends:     icinga2, icinga2-classicui, monitoring-plugins-standard, \
+Depends:     icinga, monitoring-plugins-standard, \
              nagios-nrpe-plugin
 Why:         System and network monitoring with web UI (replacing nagios3)
 Responsible: Wolfgang Schweer
-NeedConfig:  yes, done via preseeding icinga2 user and related password
+NeedConfig:  yes, done via preseeding: icingaadmin password, enable cgi.
 
 Depends:     sitesummary
 Suggests:    ocsinventory-server, ocsinventory-reports, default-mysql-client

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