From 21158a80abf02d91ac246b9e234743a986111184 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 30 Nov 2008 19:20:11 +0100 Subject: [PATCH] Add mldonkey backup include update nagios rootfile --- config/backup/includes/mldonkey | 1 + config/rootfiles/packages/mldonkey | 1 + config/rootfiles/packages/nagios | 91 ++++++++++++++++++++++++++++-- doc/packages-list.txt | 2 +- lfs/mldonkey | 2 + src/paks/mldonkey/uninstall.sh | 4 ++ 6 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 config/backup/includes/mldonkey diff --git a/config/backup/includes/mldonkey b/config/backup/includes/mldonkey new file mode 100644 index 0000000000..a6dfee81e2 --- /dev/null +++ b/config/backup/includes/mldonkey @@ -0,0 +1 @@ +/opt/mldonkey/.mldonkey/ diff --git a/config/rootfiles/packages/mldonkey b/config/rootfiles/packages/mldonkey index d04864198d..2df3ee0f01 100644 --- a/config/rootfiles/packages/mldonkey +++ b/config/rootfiles/packages/mldonkey @@ -1,3 +1,4 @@ +var/ipfire/backup/addons/includes/mldonkey etc/init.d/mldonkey #opt/mldonkey opt/mldonkey/.mldonkey diff --git a/config/rootfiles/packages/nagios b/config/rootfiles/packages/nagios index ef0ccc2366..453db35d86 100644 --- a/config/rootfiles/packages/nagios +++ b/config/rootfiles/packages/nagios @@ -1,6 +1,86 @@ +#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 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_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_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 @@ -17,9 +97,9 @@ usr/share/nagios #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/tac.cgi #usr/share/nagios/cgi-bin/trends.cgi -usr/share/nagios/contexthelp +#usr/share/nagios/contexthelp #usr/share/nagios/contexthelp/A1.html #usr/share/nagios/contexthelp/A2.html #usr/share/nagios/contexthelp/A3.html @@ -83,7 +163,7 @@ usr/share/nagios/contexthelp #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 #usr/share/nagios/docs/about.html #usr/share/nagios/docs/activechecks.html #usr/share/nagios/docs/adaptive.html @@ -93,6 +173,7 @@ usr/share/nagios/docs #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 @@ -337,9 +418,6 @@ usr/share/nagios/images usr/share/nagios/index.html usr/share/nagios/main.html usr/share/nagios/media -#usr/share/nagios/media/critical.wav -#usr/share/nagios/media/hostdown.wav -#usr/share/nagios/media/warning.wav #usr/share/nagios/robots.txt #usr/share/nagios/side.html usr/share/nagios/ssi @@ -362,4 +440,5 @@ usr/share/nagios/stylesheets #usr/share/nagios/stylesheets/tac.css #usr/share/nagios/stylesheets/trends.css var/archives +var/rw var/spool/checkresults diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 25678aca7c..b944821d12 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -205,7 +205,7 @@ * mtd-CVS-20070507 * mtools-3.9.10 * mysql-5.0.24a -* nagios-3.0 +* nagios-3.0.5 * nano-1.2.5 * nasm-0.98.39 * ncftp-3.2.1-src diff --git a/lfs/mldonkey b/lfs/mldonkey index 868a6aa617..cef5de45ab 100644 --- a/lfs/mldonkey +++ b/lfs/mldonkey @@ -89,5 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -p /var/log/mldonkey/{incoming,temp} -mkdir -p /var/log/mldonkey/incoming/{directories,files} chown -Rv mldonkey.mldonkey /var/log/mldonkey/{incoming,temp} + install -v -m 644 $(DIR_SRC)/config/backup/includes/mldonkey \ + /var/ipfire/backup/addons/includes/mldonkey @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/paks/mldonkey/uninstall.sh b/src/paks/mldonkey/uninstall.sh index 5a2936a00e..fc183a3d5d 100644 --- a/src/paks/mldonkey/uninstall.sh +++ b/src/paks/mldonkey/uninstall.sh @@ -23,5 +23,9 @@ # . /opt/pakfire/lib/functions.sh /etc/init.d/mldonkey stop +if [ ! -e /var/ipfire/backup/addons/includes/mldonkey ]; then + echo /opt/mldonkey/.mldonkey > /var/ipfire/backup/addons/includes/mldonkey +fi +make_backup ${NAME} remove_files rm -rf /etc/rc.d/rc*.d/*mldonkey -- 2.39.2