[checkmk-commits] 6912 nagios: Dropped legacy Nagios GUI

Module: check_mk Branch: master Commit: 23d69840a8caa38a547e58704a281571346c52c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23d69840a8caa3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 12:00:07 2018 +0100 6912 nagios: Dropped legacy Nagios GUI The "classic" Nagios GUI has been removed from our packages for security reasons. It was only left for users using the Nagios core in previous versions and was only supporting single site setups. Change-Id: Ie4172ccabd2c0d59bbdaa57188f619ef3b9e6ada --- .werks/6912 | 11 +++++++++++ omd/packages/nagios/nagios.make | 26 +------------------------- omd/packages/omd/CORE.hook | 23 +++++------------------ 3 files changed, 17 insertions(+), 43 deletions(-) diff --git a/.werks/6912 b/.werks/6912 new file mode 100644 index 0000000..882f619 --- /dev/null +++ b/.werks/6912 @@ -0,0 +1,11 @@ +Title: nagios: Dropped legacy Nagios GUI +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542884289 +Class: fix + +The "classic" Nagios GUI has been removed from our packages for security reasons. It was only left +for users using the Nagios core in previous versions and was only supporting single site setups. diff --git a/omd/packages/nagios/nagios.make b/omd/packages/nagios/nagios.make index e83a3a6..27ffca6 100644 --- a/omd/packages/nagios/nagios.make +++ b/omd/packages/nagios/nagios.make @@ -31,35 +31,11 @@ $(NAGIOS_BUILD): $(NAGIOS_PATCHING) $(TOUCH) $@ $(NAGIOS_INSTALL): - $(MAKE) DESTDIR=$(DESTDIR) -C $(NAGIOS_DIR) install-base install-cgis install-html install-classicui - rm -f $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/config.php.inc - - # Install Themes - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/classicui - cp -af $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/stylesheets $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/classicui/ - cp -af $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/images $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/classicui/ - $(MAKE) DESTDIR=$(DESTDIR) -C $(NAGIOS_DIR) install-exfoliation - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/exfoliation - cp -af $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/stylesheets $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/exfoliation/ - cp -af $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/images $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/exfoliation/ - # remove original files - rm -rf $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/stylesheets - rm -rf $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/images - # Link ClassicUI - cd $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs; rm -rf styleshets; ln -sfn themes/classicui/stylesheets - cd $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs; rm -rf images; ln -sfn themes/classicui/images + $(MAKE) DESTDIR=$(DESTDIR) -C $(NAGIOS_DIR) install-base mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/nagios install -m 664 $(NAGIOS_DIR)/p1.pl $(DESTDIR)$(OMD_ROOT)/lib/nagios - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/ssi - install -m 755 $(PACKAGE_DIR)/$(NAGIOS)/ssi-wrapper.pl $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/ssi - - for f in common avail cmd config extinfo histogram history notifications outages showlog status statusmap statuswml statuswrl summary tac trends ; do \ - ln -sfn ssi-wrapper.pl $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/ssi/$$f-header.ssi ; \ - ln -sfn ssi-wrapper.pl $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/ssi/$$f-footer.ssi ; \ - done - # Copy package documentations to have these information in the binary packages mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAGIOS) for file in README THANKS LEGAL LICENSE ; do \ diff --git a/omd/packages/omd/CORE.hook b/omd/packages/omd/CORE.hook index 2681e0e..b8720d6 100755 --- a/omd/packages/omd/CORE.hook +++ b/omd/packages/omd/CORE.hook @@ -23,7 +23,6 @@ case "$1" in if [ -e $OMD_ROOT/bin/cmc ] ; then echo "cmc" elif [ -e $OMD_ROOT/bin/nagios ] ; then echo "nagios" elif [ -e $OMD_ROOT/bin/icinga ] ; then echo "icinga" - elif [ -e $OMD_ROOT/bin/shinken-arbiter ] ; then echo "shinken" else echo "none" fi ;; @@ -31,18 +30,17 @@ case "$1" in [ ! -e $OMD_ROOT/bin/cmc ] || echo "cmc: Check_MK Micro core" [ ! -e $OMD_ROOT/bin/nagios ] || echo "nagios: Nagios" [ ! -e $OMD_ROOT/bin/icinga ] || echo "icinga: Icinga" - [ ! -e $OMD_ROOT/bin/shinken-arbiter ] || echo "shinken: Shinken" echo "none: No monitoring core" ;; set) # cleanup the former selection - if [ "$2" != "nagios" ] ; then - rm -f $OMD_ROOT/etc/apache/conf.d/nagios.conf - rm -f $OMD_ROOT/etc/apache/conf.d/icinga.conf - fi - if [ "$2" != "shinken" ] ; then + if [ -e $OMD_ROOT/etc/apache/conf.d/shinken.conf ] ; then rm -f $OMD_ROOT/etc/apache/conf.d/shinken.conf + fi + if [ -e $OMD_ROOT/etc/apache/conf.d/nagios.conf ] ; then rm -f $OMD_ROOT/etc/apache/conf.d/nagios.conf + fi + if [ -e $OMD_ROOT/etc/apache/conf.d/icinga.conf ] ; then rm -f $OMD_ROOT/etc/apache/conf.d/icinga.conf fi if [ "$2" != "cmc" ] ; then @@ -61,8 +59,6 @@ case "$1" in # now setup the new selection if [ "$2" == "nagios" ] then - make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf - make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf make_link nagios $OMD_ROOT/etc/init.d/core # Refresh Check_MK Configuration after changing back from CMC if [ -e $OMD_ROOT/var/check_mk/core/config ] ; then @@ -70,16 +66,7 @@ case "$1" in fi elif [ "$2" == "icinga" ] then - make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf - make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf make_link icinga $OMD_ROOT/etc/init.d/core - elif [ "$2" == "shinken" ] - then - # Thruk is the default interface, but classic is possible - make_link ../../shinken/apache-cgi.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf - make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf - make_link ../../shinken/apache.conf $OMD_ROOT/etc/apache/conf.d/shinken.conf - make_link shinken $OMD_ROOT/etc/init.d/core elif [ "$2" == "cmc" ] then make_link cmc $OMD_ROOT/etc/init.d/core