From a33199f06367fc95e9fc87c07800617d7948bcea Mon Sep 17 00:00:00 2001 From: Peter Pfeiffer Date: Fri, 3 Jul 2009 13:52:37 -0400 Subject: [PATCH 1/4] Add deps for NagiosQL --- lfs/nagiosql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/nagiosql b/lfs/nagiosql index 1157ee2e8..4f3182143 100644 --- a/lfs/nagiosql +++ b/lfs/nagiosql @@ -35,7 +35,7 @@ TARGET = $(DIR_INFO)/nagiosql-$(VER) PROG = nagiosql PAK_VER = 1 -DEPS = "nagios" +DEPS = "nagios mysql" ############################################################################### # Top-level Rules @@ -85,7 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -vf $(DIR_SRC)/config/nagiosql/nagios.conf /etc/httpd/conf/vhosts.d/ cp -vrf $(DIR_SRC)/config/nagiosql/pear/HTML /usr/lib/php cp -vrf $(DIR_SRC)/config/nagiosql/etc / - chown -R nobody /etc/nagiosql + chown -R nobody:nobody /etc/nagiosql chown nobody /usr/share/nagiosql/config @rm -rf $(DIR_APP) @$(POSTBUILD) From 3eeef6ca20d183232cd4da039b8f825db627730a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 4 Jul 2009 00:41:29 +0200 Subject: [PATCH 2/4] Add missing Technotrend FullFeatured firmware bootloader --- config/rootfiles/common/linux-firmware | 1 + config/rootfiles/core/29/filelists/files | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware index 8ae06f0e8..386e6d964 100644 --- a/config/rootfiles/common/linux-firmware +++ b/config/rootfiles/common/linux-firmware @@ -59,6 +59,7 @@ lib/firmware/ti_5052.fw lib/firmware/tr_smctr.bin #lib/firmware/ttusb-budget lib/firmware/ttusb-budget/dspbootcode.bin +lib/firmware/av7110/bootcode.bin #lib/firmware/vicam lib/firmware/vicam/firmware.fw lib/firmware/whiteheat.fw diff --git a/config/rootfiles/core/29/filelists/files b/config/rootfiles/core/29/filelists/files index c7b879735..67453cb34 100644 --- a/config/rootfiles/core/29/filelists/files +++ b/config/rootfiles/core/29/filelists/files @@ -3,3 +3,4 @@ etc/system-release srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ids.cgi var/ipfire/menu.d/50-firewall.menu +lib/firmware/av7110/bootcode.bin From b4f7f8b6f812119bc299418821d8a8987071d342 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 6 Jul 2009 19:13:16 +0200 Subject: [PATCH 3/4] Add icon-changes to core29 --- config/rootfiles/core/29/filelists/files | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/rootfiles/core/29/filelists/files b/config/rootfiles/core/29/filelists/files index 67453cb34..536160d24 100644 --- a/config/rootfiles/core/29/filelists/files +++ b/config/rootfiles/core/29/filelists/files @@ -2,5 +2,9 @@ etc/collectd.conf etc/system-release srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/blob.gif +srv/web/ipfire/images/info.gif +srv/web/ipfire/images/openvpn.gif var/ipfire/menu.d/50-firewall.menu lib/firmware/av7110/bootcode.bin From f6a6ea8d5ea0bf9a9344d99b0715e5a3fad1476a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 6 Jul 2009 19:29:58 +0200 Subject: [PATCH 4/4] Add aliases to backup and run setaliases at red start (if red=static only) --- config/backup/include | 3 ++- config/rootfiles/core/29/filelists/files | 2 ++ src/initscripts/init.d/networking/red | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/backup/include b/config/backup/include index 0ce2dc6ca..87abb071e 100644 --- a/config/backup/include +++ b/config/backup/include @@ -3,7 +3,7 @@ /var/ipfire/*/*.pem /var/ipfire/*/config /var/ipfire/*/enable -/var/ipifre/*/*enable* +/var/ipfire/*/*enable* /etc/passwd /etc/shadow /etc/group @@ -30,3 +30,4 @@ /etc/sysconfig/rc.local /root/.gitconfig /root/.bash_history +/var/ipfire/ethernet/aliases diff --git a/config/rootfiles/core/29/filelists/files b/config/rootfiles/core/29/filelists/files index 536160d24..9b62cc763 100644 --- a/config/rootfiles/core/29/filelists/files +++ b/config/rootfiles/core/29/filelists/files @@ -8,3 +8,5 @@ srv/web/ipfire/images/info.gif srv/web/ipfire/images/openvpn.gif var/ipfire/menu.d/50-firewall.menu lib/firmware/av7110/bootcode.bin +var/ipfire/backup/include +etc/rc.d/init.d/networking/red diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index 6a85eb48e..f90e07378 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -122,7 +122,10 @@ case "${1}" in evaluate_retval run_subdir ${rc_base}/init.d/networking/red.up/ - + + # Configure aliases only if red static + /usr/local/bin/setaliases + elif [ "${TYPE}" == "DHCP" ]; then if [ -e $LEASEINFO ]; then