webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x

Browse Source 
Conflicts:
	config/rootfiles/core/29/filelists/files
This commit is contained in:
Michael Tremer
2009-07-06 20:04:39 +02:00
parent b276b2a268 f6a6ea8d5e
commit 54585197da
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/backup/include
View File

@@ -3,7 +3,7 @@
/var/ipfire/*/*.pem /var/ipfire/*/*.pem
/var/ipfire/*/config /var/ipfire/*/config
/var/ipfire/*/enable /var/ipfire/*/enable
/var/ipifre/*/*enable* /var/ipfire/*/*enable*
/etc/passwd /etc/passwd
/etc/shadow /etc/shadow
/etc/group /etc/group
@@ -30,3 +30,4 @@
/etc/sysconfig/rc.local /etc/sysconfig/rc.local
/root/.gitconfig /root/.gitconfig
/root/.bash_history /root/.bash_history
/var/ipfire/ethernet/aliases

1
config/rootfiles/common/linux-firmware
View File

@@ -59,6 +59,7 @@ lib/firmware/ti_5052.fw
lib/firmware/tr_smctr.bin lib/firmware/tr_smctr.bin
#lib/firmware/ttusb-budget #lib/firmware/ttusb-budget
lib/firmware/ttusb-budget/dspbootcode.bin lib/firmware/ttusb-budget/dspbootcode.bin
lib/firmware/av7110/bootcode.bin
#lib/firmware/vicam #lib/firmware/vicam
lib/firmware/vicam/firmware.fw lib/firmware/vicam/firmware.fw
lib/firmware/whiteheat.fw lib/firmware/whiteheat.fw

3
config/rootfiles/core/29/filelists/files
View File

@@ -7,3 +7,6 @@ srv/web/ipfire/html/blob.gif
srv/web/ipfire/html/images/info.gif srv/web/ipfire/html/images/info.gif
srv/web/ipfire/html/images/openvpn.png srv/web/ipfire/html/images/openvpn.png
var/ipfire/menu.d/50-firewall.menu var/ipfire/menu.d/50-firewall.menu
lib/firmware/av7110/bootcode.bin
var/ipfire/backup/include
etc/rc.d/init.d/networking/red

4
lfs/nagiosql
View File

@@ -35,7 +35,7 @@ TARGET = $(DIR_INFO)/nagiosql-$(VER)
PROG = nagiosql PROG = nagiosql
PAK_VER = 1 PAK_VER = 1
DEPS = "nagios" DEPS = "nagios mysql"
############################################################################### ###############################################################################
# Top-level Rules # 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 -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/pear/HTML /usr/lib/php
cp -vrf $(DIR_SRC)/config/nagiosql/etc / cp -vrf $(DIR_SRC)/config/nagiosql/etc /
chown -R nobody /etc/nagiosql chown -R nobody:nobody /etc/nagiosql
chown nobody /usr/share/nagiosql/config chown nobody /usr/share/nagiosql/config
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

5
src/initscripts/init.d/networking/red
View File

@@ -122,7 +122,10 @@ case "${1}" in
evaluate_retval evaluate_retval
run_subdir ${rc_base}/init.d/networking/red.up/ run_subdir ${rc_base}/init.d/networking/red.up/
# Configure aliases only if red static
/usr/local/bin/setaliases
elif [ "${TYPE}" == "DHCP" ]; then elif [ "${TYPE}" == "DHCP" ]; then
if [ -e $LEASEINFO ]; then if [ -e $LEASEINFO ]; then