Drop nagios

This is no longer maintained and icinga is available.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/httpd/vhosts.d/nagios.conf b/config/httpd/vhosts.d/nagios.conf
deleted file mode 100644 (file)
index 8a320d7..0000000
--- a/config/httpd/vhosts.d/nagios.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-Listen 1008
-
-<VirtualHost *:1008>
-
-# SAMPLE CONFIG SNIPPETS FOR APACHE WEB SERVER
-# Last Modified: 11-26-2005
-#
-# This file contains examples of entries that need
-# to be incorporated into your Apache web server
-# configuration file.  Customize the paths, etc. as
-# needed to fit your system.
-
-ScriptAlias /nagios/cgi-bin "/usr/share/nagios/cgi-bin"
-
-<Directory "/usr/share/nagios/cgi-bin">
-#  SSLRequireSSL
-   Options ExecCGI
-   AllowOverride None
-#  Require all granted
-#  Require ip 127.0.0.1
-   AuthName "Nagios Access"
-   AuthType Basic
-   AuthUserFile /etc/nagios/htpasswd.users
-   Require valid-user
-</Directory>
-
-Alias /nagios "/usr/share/nagios"
-
-<Directory "/usr/share/nagios">
-#  SSLRequireSSL
-   Options None
-   AllowOverride None
-#  Require all granted
-#  Require ip 127.0.0.1
-   AuthName "Nagios Access"
-   AuthType Basic
-   AuthUserFile /etc/nagios/htpasswd.users
-   Require valid-user
-</Directory>
-
-</VirtualHost>

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 64faa7926c5ddd1ff7ebe543457e84f387391de1..d7aa00438288fb10f5998aacc96f8cef12ef4cff 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -46,7 +46,6 @@ etc/httpd/conf/uid.conf
 etc/httpd/conf/vhosts.d/captive.conf
 etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/httpd/conf/vhosts.d/ipfire-interface.conf
-#etc/httpd/conf/vhosts.d/nagios.conf
 #etc/httpd/conf/vhosts.d/openmailadmin.conf
 #srv/web
 #srv/web/ipfire

diff --git a/config/rootfiles/packages/nagios b/config/rootfiles/packages/nagios
deleted file mode 100644 (file)
index 971a360..0000000
--- a/config/rootfiles/packages/nagios
+++ /dev/null
@@ -1,453 +0,0 @@
-etc/httpd/conf/conf.d/nagios.conf
-#etc/nagios
-etc/nagios/cgi.cfg
-etc/nagios/nagios.cfg
-#etc/nagios/objects
-etc/nagios/objects/commands.cfg
-etc/nagios/objects/contacts.cfg
-etc/nagios/objects/localhost.cfg
-etc/nagios/objects/printer.cfg
-etc/nagios/objects/switch.cfg
-etc/nagios/objects/templates.cfg
-etc/nagios/objects/timeperiods.cfg
-etc/nagios/objects/windows.cfg
-etc/nagios/resource.cfg
-etc/rc.d/init.d/nagios
-etc/rc.d/rc0.d/K33nagios
-etc/rc.d/rc3.d/S67nagios
-etc/rc.d/rc6.d/K33nagios
-usr/bin/nagios
-usr/bin/nagiostats
-usr/bin/p1.pl
-usr/lib/nagios
-#usr/lib/nagios/check_apt
-#usr/lib/nagios/check_breeze
-#usr/lib/nagios/check_by_ssh
-#usr/lib/nagios/check_clamd
-#usr/lib/nagios/check_cluster
-#usr/lib/nagios/check_dhcp
-#usr/lib/nagios/check_dig
-#usr/lib/nagios/check_disk
-#usr/lib/nagios/check_disk_smb
-#usr/lib/nagios/check_dns
-#usr/lib/nagios/check_dummy
-#usr/lib/nagios/check_file_age
-#usr/lib/nagios/check_flexlm
-#usr/lib/nagios/check_ftp
-#usr/lib/nagios/check_hpjd
-#usr/lib/nagios/check_http
-#usr/lib/nagios/check_icmp
-#usr/lib/nagios/check_ide_smart
-#usr/lib/nagios/check_ifoperstatus
-#usr/lib/nagios/check_ifstatus
-#usr/lib/nagios/check_imap
-#usr/lib/nagios/check_ircd
-#usr/lib/nagios/check_jabber
-#usr/lib/nagios/check_ldap
-#usr/lib/nagios/check_ldaps
-#usr/lib/nagios/check_load
-#usr/lib/nagios/check_log
-#usr/lib/nagios/check_mailq
-#usr/lib/nagios/check_mrtg
-#usr/lib/nagios/check_mrtgtraf
-#usr/lib/nagios/check_mysql
-#usr/lib/nagios/check_mysql_query
-#usr/lib/nagios/check_nagios
-#usr/lib/nagios/check_nntp
-#usr/lib/nagios/check_nntps
-#usr/lib/nagios/check_nt
-#usr/lib/nagios/check_ntp
-#usr/lib/nagios/check_ntp_peer
-#usr/lib/nagios/check_ntp_time
-#usr/lib/nagios/check_nwstat
-#usr/lib/nagios/check_oracle
-#usr/lib/nagios/check_overcr
-#usr/lib/nagios/check_ping
-#usr/lib/nagios/check_pop
-#usr/lib/nagios/check_procs
-#usr/lib/nagios/check_real
-#usr/lib/nagios/check_rpc
-#usr/lib/nagios/check_sensors
-#usr/lib/nagios/check_simap
-#usr/lib/nagios/check_smtp
-#usr/lib/nagios/check_snmp
-#usr/lib/nagios/check_spop
-#usr/lib/nagios/check_ssh
-#usr/lib/nagios/check_ssmtp
-#usr/lib/nagios/check_swap
-#usr/lib/nagios/check_tcp
-#usr/lib/nagios/check_time
-#usr/lib/nagios/check_udp
-#usr/lib/nagios/check_ups
-#usr/lib/nagios/check_users
-#usr/lib/nagios/check_wave
-#usr/lib/nagios/negate
-#usr/lib/nagios/urlize
-#usr/lib/nagios/utils.pm
-#usr/lib/nagios/utils.sh
-usr/share/locale/de/LC_MESSAGES/nagios-plugins.mo
-#usr/share/locale/fr/LC_MESSAGES/nagios-plugins.mo
-usr/share/nagios
-#usr/share/nagios/cgi-bin
-#usr/share/nagios/cgi-bin/avail.cgi
-#usr/share/nagios/cgi-bin/cmd.cgi
-#usr/share/nagios/cgi-bin/config.cgi
-#usr/share/nagios/cgi-bin/extinfo.cgi
-#usr/share/nagios/cgi-bin/histogram.cgi
-#usr/share/nagios/cgi-bin/history.cgi
-#usr/share/nagios/cgi-bin/notifications.cgi
-#usr/share/nagios/cgi-bin/outages.cgi
-#usr/share/nagios/cgi-bin/showlog.cgi
-#usr/share/nagios/cgi-bin/status.cgi
-#usr/share/nagios/cgi-bin/statusmap.cgi
-#usr/share/nagios/cgi-bin/statuswml.cgi
-#usr/share/nagios/cgi-bin/statuswrl.cgi
-#usr/share/nagios/cgi-bin/summary.cgi
-#usr/share/nagios/cgi-bin/tac.cgi
-#usr/share/nagios/cgi-bin/trends.cgi
-#usr/share/nagios/contexthelp
-#usr/share/nagios/contexthelp/A1.html
-#usr/share/nagios/contexthelp/A2.html
-#usr/share/nagios/contexthelp/A3.html
-#usr/share/nagios/contexthelp/A4.html
-#usr/share/nagios/contexthelp/A5.html
-#usr/share/nagios/contexthelp/A6.html
-#usr/share/nagios/contexthelp/A7.html
-#usr/share/nagios/contexthelp/B1.html
-#usr/share/nagios/contexthelp/C1.html
-#usr/share/nagios/contexthelp/D1.html
-#usr/share/nagios/contexthelp/E1.html
-#usr/share/nagios/contexthelp/F1.html
-#usr/share/nagios/contexthelp/G1.html
-#usr/share/nagios/contexthelp/G2.html
-#usr/share/nagios/contexthelp/G3.html
-#usr/share/nagios/contexthelp/G4.html
-#usr/share/nagios/contexthelp/G5.html
-#usr/share/nagios/contexthelp/G6.html
-#usr/share/nagios/contexthelp/H1.html
-#usr/share/nagios/contexthelp/H2.html
-#usr/share/nagios/contexthelp/H3.html
-#usr/share/nagios/contexthelp/H4.html
-#usr/share/nagios/contexthelp/H5.html
-#usr/share/nagios/contexthelp/H6.html
-#usr/share/nagios/contexthelp/H7.html
-#usr/share/nagios/contexthelp/H8.html
-#usr/share/nagios/contexthelp/I1.html
-#usr/share/nagios/contexthelp/I2.html
-#usr/share/nagios/contexthelp/I3.html
-#usr/share/nagios/contexthelp/I4.html
-#usr/share/nagios/contexthelp/I5.html
-#usr/share/nagios/contexthelp/I6.html
-#usr/share/nagios/contexthelp/I7.html
-#usr/share/nagios/contexthelp/I8.html
-#usr/share/nagios/contexthelp/I9.html
-#usr/share/nagios/contexthelp/J1.html
-#usr/share/nagios/contexthelp/K1.html
-#usr/share/nagios/contexthelp/L1.html
-#usr/share/nagios/contexthelp/L10.html
-#usr/share/nagios/contexthelp/L11.html
-#usr/share/nagios/contexthelp/L12.html
-#usr/share/nagios/contexthelp/L13.html
-#usr/share/nagios/contexthelp/L2.html
-#usr/share/nagios/contexthelp/L3.html
-#usr/share/nagios/contexthelp/L4.html
-#usr/share/nagios/contexthelp/L5.html
-#usr/share/nagios/contexthelp/L6.html
-#usr/share/nagios/contexthelp/L7.html
-#usr/share/nagios/contexthelp/L8.html
-#usr/share/nagios/contexthelp/L9.html
-#usr/share/nagios/contexthelp/M1.html
-#usr/share/nagios/contexthelp/M2.html
-#usr/share/nagios/contexthelp/M3.html
-#usr/share/nagios/contexthelp/M4.html
-#usr/share/nagios/contexthelp/M5.html
-#usr/share/nagios/contexthelp/M6.html
-#usr/share/nagios/contexthelp/N1.html
-#usr/share/nagios/contexthelp/N2.html
-#usr/share/nagios/contexthelp/N3.html
-#usr/share/nagios/contexthelp/N4.html
-#usr/share/nagios/contexthelp/N5.html
-#usr/share/nagios/contexthelp/N6.html
-#usr/share/nagios/contexthelp/N7.html
-#usr/share/nagios/docs
-#usr/share/nagios/docs/about.html
-#usr/share/nagios/docs/activechecks.html
-#usr/share/nagios/docs/adaptive.html
-#usr/share/nagios/docs/addons.html
-#usr/share/nagios/docs/beginners.html
-#usr/share/nagios/docs/cachedchecks.html
-#usr/share/nagios/docs/cgiauth.html
-#usr/share/nagios/docs/cgiincludes.html
-#usr/share/nagios/docs/cgis.html
-#usr/share/nagios/docs/cgisecurity.html
-#usr/share/nagios/docs/checkscheduling.html
-#usr/share/nagios/docs/clusters.html
-#usr/share/nagios/docs/config.html
-#usr/share/nagios/docs/configcgi.html
-#usr/share/nagios/docs/configmain.html
-#usr/share/nagios/docs/configobject.html
-#usr/share/nagios/docs/customobjectvars.html
-#usr/share/nagios/docs/dependencies.html
-#usr/share/nagios/docs/dependencychecks.html
-#usr/share/nagios/docs/distributed.html
-#usr/share/nagios/docs/downtime.html
-#usr/share/nagios/docs/embeddedperl.html
-#usr/share/nagios/docs/epnplugins.html
-#usr/share/nagios/docs/escalations.html
-#usr/share/nagios/docs/eventhandlers.html
-#usr/share/nagios/docs/extcommands.html
-#usr/share/nagios/docs/faststartup.html
-#usr/share/nagios/docs/flapping.html
-#usr/share/nagios/docs/freshness.html
-#usr/share/nagios/docs/funstuff.html
-#usr/share/nagios/docs/hostchecks.html
-#usr/share/nagios/docs/images
-#usr/share/nagios/docs/images/activechecks.png
-#usr/share/nagios/docs/images/cachedcheckgraphs.png
-#usr/share/nagios/docs/images/cachedchecks.png
-#usr/share/nagios/docs/images/cachedchecks1.png
-#usr/share/nagios/docs/images/cgi-avail-a.png
-#usr/share/nagios/docs/images/cgi-avail-b.png
-#usr/share/nagios/docs/images/cgi-cmd.png
-#usr/share/nagios/docs/images/cgi-config.png
-#usr/share/nagios/docs/images/cgi-extinfo-a.png
-#usr/share/nagios/docs/images/cgi-extinfo-b.png
-#usr/share/nagios/docs/images/cgi-extinfo-c.png
-#usr/share/nagios/docs/images/cgi-extinfo-d.png
-#usr/share/nagios/docs/images/cgi-histogram.png
-#usr/share/nagios/docs/images/cgi-history.png
-#usr/share/nagios/docs/images/cgi-notifications.png
-#usr/share/nagios/docs/images/cgi-outages.png
-#usr/share/nagios/docs/images/cgi-showlog.png
-#usr/share/nagios/docs/images/cgi-status-a.png
-#usr/share/nagios/docs/images/cgi-status-b.png
-#usr/share/nagios/docs/images/cgi-status-c.png
-#usr/share/nagios/docs/images/cgi-status-d.png
-#usr/share/nagios/docs/images/cgi-statusmap.png
-#usr/share/nagios/docs/images/cgi-statuswml.png
-#usr/share/nagios/docs/images/cgi-statuswrl.png
-#usr/share/nagios/docs/images/cgi-summary.png
-#usr/share/nagios/docs/images/cgi-tac.png
-#usr/share/nagios/docs/images/cgi-trends.png
-#usr/share/nagios/docs/images/checkmark.png
-#usr/share/nagios/docs/images/checktiming.png
-#usr/share/nagios/docs/images/configoverview.png
-#usr/share/nagios/docs/images/distributed.png
-#usr/share/nagios/docs/images/downtime.png
-#usr/share/nagios/docs/images/epn.png
-#usr/share/nagios/docs/images/eventhandlers.png
-#usr/share/nagios/docs/images/externalcommands.png
-#usr/share/nagios/docs/images/fast-startup.png
-#usr/share/nagios/docs/images/fast-startup1.png
-#usr/share/nagios/docs/images/fast-startup2.png
-#usr/share/nagios/docs/images/freshness.png
-#usr/share/nagios/docs/images/host-dependencies.png
-#usr/share/nagios/docs/images/important.gif
-#usr/share/nagios/docs/images/integrationoverview.png
-#usr/share/nagios/docs/images/interleaved1.png
-#usr/share/nagios/docs/images/interleaved2.png
-#usr/share/nagios/docs/images/interleaved3.png
-#usr/share/nagios/docs/images/logofullsize.png
-#usr/share/nagios/docs/images/monitoring-printers.png
-#usr/share/nagios/docs/images/monitoring-routers.png
-#usr/share/nagios/docs/images/monitoring-windows.png
-#usr/share/nagios/docs/images/mrtg-activehostchecks.png
-#usr/share/nagios/docs/images/mrtg-activelychecked.png
-#usr/share/nagios/docs/images/mrtg-activeservicechecks.png
-#usr/share/nagios/docs/images/mrtg-cachedchecks.png
-#usr/share/nagios/docs/images/mrtg-commandbuffers.png
-#usr/share/nagios/docs/images/mrtg-externalcommands.png
-#usr/share/nagios/docs/images/mrtg-hostperfstats.png
-#usr/share/nagios/docs/images/mrtg-hoststatechange.png
-#usr/share/nagios/docs/images/mrtg-passivechecks.png
-#usr/share/nagios/docs/images/mrtg-passivelychecked.png
-#usr/share/nagios/docs/images/mrtg-serviceperfstats.png
-#usr/share/nagios/docs/images/mrtg-servicestatechange.png
-#usr/share/nagios/docs/images/multiple-templates1.png
-#usr/share/nagios/docs/images/multiple-templates2.png
-#usr/share/nagios/docs/images/nagios.jpg
-#usr/share/nagios/docs/images/ndoutils.png
-#usr/share/nagios/docs/images/network-outage1.png
-#usr/share/nagios/docs/images/network-outage2.png
-#usr/share/nagios/docs/images/noninterleaved1.png
-#usr/share/nagios/docs/images/noninterleaved2.png
-#usr/share/nagios/docs/images/note.gif
-#usr/share/nagios/docs/images/nrpe.png
-#usr/share/nagios/docs/images/nsca.png
-#usr/share/nagios/docs/images/nscpp.png
-#usr/share/nagios/docs/images/objects-commands.png
-#usr/share/nagios/docs/images/objects-contacts.png
-#usr/share/nagios/docs/images/objects-hosts.png
-#usr/share/nagios/docs/images/objects-services.png
-#usr/share/nagios/docs/images/objects-timeperiods.png
-#usr/share/nagios/docs/images/passivechecks.png
-#usr/share/nagios/docs/images/passivehosttranslation.png
-#usr/share/nagios/docs/images/plugins.png
-#usr/share/nagios/docs/images/predictive-dependency-checks.png
-#usr/share/nagios/docs/images/printer.png
-#usr/share/nagios/docs/images/reachability1.png
-#usr/share/nagios/docs/images/reachability2.png
-#usr/share/nagios/docs/images/reachability3.png
-#usr/share/nagios/docs/images/reachability4.png
-#usr/share/nagios/docs/images/redudancy.png
-#usr/share/nagios/docs/images/redundancy.png
-#usr/share/nagios/docs/images/security.png
-#usr/share/nagios/docs/images/security1.png
-#usr/share/nagios/docs/images/security2.png
-#usr/share/nagios/docs/images/security3.png
-#usr/share/nagios/docs/images/seealso.gif
-#usr/share/nagios/docs/images/service-dependencies.png
-#usr/share/nagios/docs/images/statetransitions.png
-#usr/share/nagios/docs/images/statetransitions2.png
-#usr/share/nagios/docs/images/stoprestart.png
-#usr/share/nagios/docs/images/switch.png
-#usr/share/nagios/docs/images/tcpwrappers.png
-#usr/share/nagios/docs/images/tip.gif
-#usr/share/nagios/docs/images/tuning.png
-#usr/share/nagios/docs/images/upto.gif
-#usr/share/nagios/docs/index.html
-#usr/share/nagios/docs/int-snmptrap.html
-#usr/share/nagios/docs/int-tcpwrappers.html
-#usr/share/nagios/docs/integration.html
-#usr/share/nagios/docs/largeinstalltweaks.html
-#usr/share/nagios/docs/macrolist.html
-#usr/share/nagios/docs/macros.html
-#usr/share/nagios/docs/monitoring-linux.html
-#usr/share/nagios/docs/monitoring-netware.html
-#usr/share/nagios/docs/monitoring-printers.html
-#usr/share/nagios/docs/monitoring-publicservices.html
-#usr/share/nagios/docs/monitoring-routers.html
-#usr/share/nagios/docs/monitoring-windows.html
-#usr/share/nagios/docs/mrtggraphs.html
-#usr/share/nagios/docs/nagiostats.html
-#usr/share/nagios/docs/networkreachability.html
-#usr/share/nagios/docs/notifications.html
-#usr/share/nagios/docs/objectdefinitions.html
-#usr/share/nagios/docs/objectinheritance.html
-#usr/share/nagios/docs/objecttricks.html
-#usr/share/nagios/docs/oncallrotation.html
-#usr/share/nagios/docs/passivechecks.html
-#usr/share/nagios/docs/passivestatetranslation.html
-#usr/share/nagios/docs/perfdata.html
-#usr/share/nagios/docs/pluginapi.html
-#usr/share/nagios/docs/plugins.html
-#usr/share/nagios/docs/quickstart-fedora.html
-#usr/share/nagios/docs/quickstart-opensuse.html
-#usr/share/nagios/docs/quickstart-ubuntu.html
-#usr/share/nagios/docs/quickstart.html
-#usr/share/nagios/docs/redundancy.html
-#usr/share/nagios/docs/robots.txt
-#usr/share/nagios/docs/security.html
-#usr/share/nagios/docs/servicechecks.html
-#usr/share/nagios/docs/stalking.html
-#usr/share/nagios/docs/startstop.html
-#usr/share/nagios/docs/statetypes.html
-#usr/share/nagios/docs/timeperiods.html
-#usr/share/nagios/docs/toc.html
-#usr/share/nagios/docs/tuning.html
-#usr/share/nagios/docs/upgrading.html
-#usr/share/nagios/docs/verifyconfig.html
-#usr/share/nagios/docs/volatileservices.html
-#usr/share/nagios/docs/whatsnew.html
-usr/share/nagios/images
-#usr/share/nagios/images/NagiosEnterprises-whitebg-112x46.png
-#usr/share/nagios/images/ack.gif
-#usr/share/nagios/images/action.gif
-#usr/share/nagios/images/command.png
-#usr/share/nagios/images/comment.gif
-#usr/share/nagios/images/contexthelp1.gif
-#usr/share/nagios/images/contexthelp2.gif
-#usr/share/nagios/images/critical.png
-#usr/share/nagios/images/delay.gif
-#usr/share/nagios/images/delete.gif
-#usr/share/nagios/images/detail.gif
-#usr/share/nagios/images/disabled.gif
-#usr/share/nagios/images/down.gif
-#usr/share/nagios/images/downtime.gif
-#usr/share/nagios/images/empty.gif
-#usr/share/nagios/images/enabled.gif
-#usr/share/nagios/images/extinfo.gif
-#usr/share/nagios/images/favicon.ico
-#usr/share/nagios/images/flapping.gif
-#usr/share/nagios/images/globe-support-150x150.png
-#usr/share/nagios/images/greendot.gif
-#usr/share/nagios/images/histogram.png
-#usr/share/nagios/images/history.gif
-#usr/share/nagios/images/hostevent.gif
-#usr/share/nagios/images/info.png
-#usr/share/nagios/images/left.gif
-#usr/share/nagios/images/logofullsize.png
-#usr/share/nagios/images/logos
-#usr/share/nagios/images/logos/nagios.gd2
-#usr/share/nagios/images/logos/nagios.gif
-#usr/share/nagios/images/logos/nagiosvrml.png
-#usr/share/nagios/images/logos/unknown.gd2
-#usr/share/nagios/images/logos/unknown.gif
-#usr/share/nagios/images/logrotate.png
-#usr/share/nagios/images/ndisabled.gif
-#usr/share/nagios/images/noack.gif
-#usr/share/nagios/images/notes.gif
-#usr/share/nagios/images/notify.gif
-#usr/share/nagios/images/orangedot.gif
-#usr/share/nagios/images/passiveonly.gif
-#usr/share/nagios/images/recovery.png
-#usr/share/nagios/images/redudancy.png
-#usr/share/nagios/images/redundancy.png
-#usr/share/nagios/images/restart.gif
-#usr/share/nagios/images/right.gif
-#usr/share/nagios/images/sblogo.jpg
-#usr/share/nagios/images/serviceevent.gif
-#usr/share/nagios/images/splunk1.gif
-#usr/share/nagios/images/splunk2.gif
-#usr/share/nagios/images/start.gif
-#usr/share/nagios/images/status.gif
-#usr/share/nagios/images/status2.gif
-#usr/share/nagios/images/status3.gif
-#usr/share/nagios/images/status4.gif
-#usr/share/nagios/images/stop.gif
-#usr/share/nagios/images/tacdisabled.jpg
-#usr/share/nagios/images/tacdisabled.png
-#usr/share/nagios/images/tacenabled.jpg
-#usr/share/nagios/images/tacenabled.png
-#usr/share/nagios/images/thermcrit.png
-#usr/share/nagios/images/thermok.png
-#usr/share/nagios/images/thermwarn.png
-#usr/share/nagios/images/trends.gif
-#usr/share/nagios/images/trendshost.png
-#usr/share/nagios/images/trendssvc.png
-#usr/share/nagios/images/unknown.png
-#usr/share/nagios/images/up.gif
-#usr/share/nagios/images/warning.png
-#usr/share/nagios/images/weblogo1.png
-#usr/share/nagios/images/zoom1.gif
-#usr/share/nagios/images/zoom2.gif
-usr/share/nagios/index.html
-usr/share/nagios/main.html
-usr/share/nagios/media
-#usr/share/nagios/robots.txt
-#usr/share/nagios/side.html
-usr/share/nagios/ssi
-usr/share/nagios/stylesheets
-#usr/share/nagios/stylesheets/avail.css
-#usr/share/nagios/stylesheets/checksanity.css
-#usr/share/nagios/stylesheets/cmd.css
-#usr/share/nagios/stylesheets/common.css
-#usr/share/nagios/stylesheets/config.css
-#usr/share/nagios/stylesheets/extinfo.css
-#usr/share/nagios/stylesheets/histogram.css
-#usr/share/nagios/stylesheets/history.css
-#usr/share/nagios/stylesheets/ministatus.css
-#usr/share/nagios/stylesheets/notifications.css
-#usr/share/nagios/stylesheets/outages.css
-#usr/share/nagios/stylesheets/showlog.css
-#usr/share/nagios/stylesheets/status.css
-#usr/share/nagios/stylesheets/statusmap.css
-#usr/share/nagios/stylesheets/summary.css
-#usr/share/nagios/stylesheets/tac.css
-#usr/share/nagios/stylesheets/trends.css
-var/nagios
-var/nagios/archives
-var/nagios/rw
-var/nagios/spool
-var/nagios/spool/checkresults
-etc/httpd/conf/vhosts.d/nagios.conf

diff --git a/lfs/nagios b/lfs/nagios
deleted file mode 100644 (file)
index 5ff1499..0000000
--- a/lfs/nagios
+++ /dev/null
@@ -1,114 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 3.0.6
-
-THISAPP    = nagios-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = nagios
-PAK_VER    = 3
-
-DEPS       = "traceroute"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE) \
-       nagios-plugins-1.4.13.tar.gz
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-nagios-plugins-1.4.13.tar.gz = $(DL_FROM)/nagios-plugins-1.4.13.tar.gz
-
-$(DL_FILE)_MD5 = 900e3f4164f4b2a18485420eeaefe812
-nagios-plugins-1.4.13.tar.gz_MD5 = be6cc7699fff3ee29d1fd4d562377386
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && \
-               ./configure --prefix=/usr \
-                       --sysconfdir=/etc/nagios \
-                       --datadir=/usr/share/nagios \
-                       --sbindir=/usr/share/nagios/cgi-bin \
-                       --localstatedir=/var/nagios \
-                       --libexecdir=/usr/lib/nagios \
-                       --with-lockfile=/var/lock/nagios.lock \
-                       --with-nagios-user=nobody \
-                       --with-nagios-group=nobody \
-                       --with-command-user=nobody \
-                       --with-command-group=nobody \
-                       --enable-embedded-perl \
-                       --with-perlcache \
-                       --with-httpd-conf=/etc/httpd/conf/conf.d \
-                       --enable-nanosleep
-       cd $(DIR_APP) && make all $(MAKETUNING)
-       cd $(DIR_APP) && make install install-init install-commandmode install-config install-webconf
-
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/nagios-plugins-1.4.13.tar.gz
-       cd $(DIR_SRC)/nagios-plugins* && ./configure --prefix=/usr \
-               --libexecdir=/usr/lib/nagios \
-               --with-nagios-user=nobody --with-nagios-group=nobody \
-               --without-ipv6
-       cd $(DIR_SRC)/nagios-plugins* && make
-       cd $(DIR_SRC)/nagios-plugins* && make install
-       chown -R nobody:nobody /var/nagios
-       ln -s /etc/init.d/nagios /etc/rc.d/rc3.d/S67nagios
-       ln -s /etc/init.d/nagios /etc/rc.d/rc0.d/K33nagios
-       ln -s /etc/init.d/nagios /etc/rc.d/rc6.d/K33nagios
-       @rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins*
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 102914163b6249c4655751b569a27139c040ca9d..20f458ffa830cdf9f1847476055c15c55c1b41b5 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1369,7 +1369,6 @@ buildipfire() {
   lfsmake2 phpSANE
   lfsmake2 tunctl
   lfsmake2 netsnmpd
-  lfsmake2 nagios
   lfsmake2 nagios_nrpe
   lfsmake2 nagios-plugins
   lfsmake2 icinga

diff --git a/src/paks/nagios/install.sh b/src/paks/nagios/install.sh
deleted file mode 100644 (file)
index 4abeba6..0000000
--- a/src/paks/nagios/install.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire is free software; you can redistribute it and/or modify           #
-# it under the terms of the GNU General Public License as published by     #
-# the Free Software Foundation; either version 2 of the License, or        #
-# (at your option) any later version.                                      #
-#                                                                          #
-# IPFire is distributed in the hope that it will be useful,                #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
-# GNU General Public License for more details.                             #
-#                                                                          #
-# You should have received a copy of the GNU General Public License        #
-# along with IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
-#                                                                          #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-restore_backup ${NAME}
-htpasswd -bmc /etc/nagios/htpasswd.users nagiosadmin nagios
-/etc/init.d/apache restart
-start_service --background ${NAME}

diff --git a/src/paks/nagios/uninstall.sh b/src/paks/nagios/uninstall.sh
deleted file mode 100644 (file)
index a7b8a53..0000000
--- a/src/paks/nagios/uninstall.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire is free software; you can redistribute it and/or modify           #
-# it under the terms of the GNU General Public License as published by     #
-# the Free Software Foundation; either version 2 of the License, or        #
-# (at your option) any later version.                                      #
-#                                                                          #
-# IPFire is distributed in the hope that it will be useful,                #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
-# GNU General Public License for more details.                             #
-#                                                                          #
-# You should have received a copy of the GNU General Public License        #
-# along with IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
-#                                                                          #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
-make_backup ${NAME}
-remove_files

diff --git a/src/paks/nagios/update.sh b/src/paks/nagios/update.sh
deleted file mode 100644 (file)
index 89c40d0..0000000
--- a/src/paks/nagios/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire is free software; you can redistribute it and/or modify           #
-# it under the terms of the GNU General Public License as published by     #
-# the Free Software Foundation; either version 2 of the License, or        #
-# (at your option) any later version.                                      #
-#                                                                          #
-# IPFire is distributed in the hope that it will be useful,                #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
-# GNU General Public License for more details.                             #
-#                                                                          #
-# You should have received a copy of the GNU General Public License        #
-# along with IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
-#                                                                          #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh