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

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

Browse Source
This commit is contained in:
Jan Paul Tuecking
2010-10-09 13:04:02 +02:00
parent 821b6a6564 34ba75f4c0
commit caf4eb1adc
66 changed files with 1618 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/initscripts/init.d/firewall
View File

@@ -140,11 +140,14 @@ case "$1" in
# CUSTOM chains, can be used by the users themselves
/sbin/iptables -N CUSTOMINPUT
/sbin/iptables -A INPUT -j CUSTOMINPUT
/sbin/iptables -N GUARDIANINPUT
/sbin/iptables -A INPUT -j GUARDIANINPUT
/sbin/iptables -N CUSTOMFORWARD
/sbin/iptables -A FORWARD -j CUSTOMFORWARD
/sbin/iptables -N CUSTOMOUTPUT
/sbin/iptables -A OUTPUT -j CUSTOMOUTPUT
/sbin/iptables -N OUTGOINGFW
/sbin/iptables -N OUTGOINGFWMAC
/sbin/iptables -A OUTPUT -j OUTGOINGFW
/sbin/iptables -t nat -N CUSTOMPREROUTING
/sbin/iptables -t nat -A PREROUTING -j CUSTOMPREROUTING
@@ -180,6 +183,7 @@ case "$1" in
/sbin/iptables -t nat -A POSTROUTING -j IPSECNAT
# Outgoing Firewall
/sbin/iptables -A FORWARD -j OUTGOINGFWMAC
/sbin/iptables -A FORWARD -j OUTGOINGFW
# localhost and ethernet.

54
src/initscripts/init.d/imspector Normal file
View File

@@ -0,0 +1,54 @@
#!/bin/sh
# Begin $rc_base/init.d/imspector
. /etc/sysconfig/rc
. $rc_functions
case "$1" in
start)
boot_mesg "Inserting imspector redirects..."
iptables -t nat -A CUSTOMPREROUTING -p tcp --destination-port 1863 -j REDIRECT --to-ports 16667
iptables -t nat -A CUSTOMPREROUTING -p tcp --destination-port 5222 -j REDIRECT --to-ports 16667
iptables -t nat -A CUSTOMPREROUTING -p tcp --destination-port 5223 -j REDIRECT --to-ports 16667
iptables -t nat -A CUSTOMPREROUTING -p tcp --destination-port 5190 -j REDIRECT --to-ports 16667
iptables -t nat -A CUSTOMPREROUTING -p tcp --destination-port 5050 -j REDIRECT --to-ports 16667
iptables -t nat -A CUSTOMPREROUTING -p tcp --destination-port 6667 -j REDIRECT --to-ports 16667
iptables -t nat -A CUSTOMPREROUTING -p tcp --destination-port 8074 -j REDIRECT --to-ports 16667
boot_mesg "Starting imspector Deamon..."
loadproc imspector -c /etc/imspector/imspector.conf
evaluate_retval
;;
stop)
boot_mesg "Stopping imspector Deamon..."
killproc /usr/sbin/imspector
evaluate_retval
boot_mesg "Remove imspector redirects..."
iptables -t nat -D CUSTOMPREROUTING -p tcp --destination-port 1863 -j REDIRECT --to-ports 16667
iptables -t nat -D CUSTOMPREROUTING -p tcp --destination-port 5222 -j REDIRECT --to-ports 16667
iptables -t nat -D CUSTOMPREROUTING -p tcp --destination-port 5223 -j REDIRECT --to-ports 16667
iptables -t nat -D CUSTOMPREROUTING -p tcp --destination-port 5190 -j REDIRECT --to-ports 16667
iptables -t nat -D CUSTOMPREROUTING -p tcp --destination-port 5050 -j REDIRECT --to-ports 16667
iptables -t nat -D CUSTOMPREROUTING -p tcp --destination-port 6667 -j REDIRECT --to-ports 16667
iptables -t nat -D CUSTOMPREROUTING -p tcp --destination-port 8074 -j REDIRECT --to-ports 16667
;;
restart)
$0 stop
sleep 1
$0 start
;;
status)
statusproc /usr/sbin/imspector
;;
*)
echo "Usage: $0 {start|stop|restart|status}"
exit 1
;;
esac
# End $rc_base/init.d/imspector

1
src/initscripts/init.d/ipfireseeder
View File

@@ -30,6 +30,7 @@ case "${1}" in
evaluate_retval
if ! grep -q "35700:35700" /var/ipfire/xtaccess/config ; then
echo "tcp,0.0.0.0/0,35700:35700,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config
echo "udp,0.0.0.0/0,35700:35700,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config
/usr/local/bin/setxtaccess
fi
;;

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

@@ -236,6 +236,21 @@ case "${1}" in
PPP_NIC=${DEVICE}
if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
PPP_NIC=nas0
DEVICE=nas0
boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
sleep 1
if [ "$TYPE" == "pppoeatm" ]; then
TYPE="pppoe"
fi
if [ "$TYPE" == "pptpatm" ]; then
TYPE="pptp"
fi
fi
if [ "$TYPE" == "vdsl" ]; then
boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_INET_VLAN} ..."
modprobe 8021q
@@ -249,65 +264,53 @@ case "${1}" in
sleep 0.2
ip link set ${PPP_NIC} up
TYPE="pppoe"
if [ "${RED_VDSL_IPTV_DISABLE}" == "0" ]; then
PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid"
LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info"
# Test to see if there is a stale pid file
if [ -f "$PIDFILE" ]; then
ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
if [ $? != 0 ]; then
rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null
fi
fi
if [ ! -f "$PIDFILE" ]; then
boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..."
vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN}
if [ -n "$MAC2" ]; then
boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}"
ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2}
evaluate_retval
fi
boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..."
/sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
RET="$?"
if [ "$RET" = "0" ]; then
. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info
echo ""
echo_ok
boot_mesg " DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:"
boot_mesg_flush
boot_mesg " IP Address: $ip_address"
boot_mesg_flush
boot_mesg " Hostname: $RED_DHCP_HOSTNAME"
boot_mesg_flush
boot_mesg " Subnet Mask: $subnet_mask"
boot_mesg_flush
boot_mesg " Default Gateway: $routers"
boot_mesg_flush
boot_mesg " DNS Server: $domain_name_servers"
boot_mesg_flush
else
echo ""
$(exit "$RET")
evaluate_retval
fi
fi
fi
fi
if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
PPP_NIC=nas0
boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
sleep 1
if [ "$TYPE" == "pppoeatm" ]; then
TYPE="pppoe"
if [ "${IPTV}" == "enable" ]; then
PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid"
LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info"
# Test to see if there is a stale pid file
if [ -f "$PIDFILE" ]; then
ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
if [ $? != 0 ]; then
rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null
fi
fi
if [ "$TYPE" == "pptpatm" ]; then
TYPE="pptp"
if [ ! -f "$PIDFILE" ]; then
boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..."
modprobe 8021q
vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN}
if [ -n "$MAC2" ]; then
boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}"
ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2}
evaluate_retval
fi
boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..."
/sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
RET="$?"
if [ "$RET" = "0" ]; then
. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info
echo ""
echo_ok
boot_mesg " DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:"
boot_mesg_flush
boot_mesg " IP Address: $ip_address"
boot_mesg_flush
boot_mesg " Hostname: $RED_DHCP_HOSTNAME"
boot_mesg_flush
boot_mesg " Subnet Mask: $subnet_mask"
boot_mesg_flush
boot_mesg " Default Gateway: $routers"
boot_mesg_flush
boot_mesg " DNS Server: $domain_name_servers"
boot_mesg_flush
else
echo ""
$(exit "$RET")
evaluate_retval
fi
fi
fi
if [ "$TYPE" == "pppoe" ] || [ "$TYPE" == "pptp" ]; then

2
src/initscripts/init.d/ntp
View File

@@ -9,7 +9,7 @@ eval $(/usr/local/bin/readhash /var/ipfire/time/settings)
case "$1" in
start)
if [ "$ENABLESETONBOOT" == "on" ]; then
boot_mesg "Setting time on booot..."
boot_mesg "Setting time on boot..."
loadproc /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf)
fi

3
src/paks/ipfireseeder/install.sh
View File

@@ -23,4 +23,7 @@
#
. /opt/pakfire/lib/functions.sh
extract_files
ln -s ../../ipfireseeder /etc/rc.d/init.d/networking/red.up/90-S-ipfireseeder
ln -s ../../ipfireseeder /etc/rc.d/init.d/networking/red.down/01-K-ipfireseeder
start_service --delay 90 --background ${NAME}

8
src/paks/ipfireseeder/uninstall.sh
View File

@@ -31,4 +31,12 @@ cat /opt/pakfire/db/rootfiles/ipfireseeder | \
mv /opt/pakfire/db/rootfiles/ipfireseeder.tmp \
/opt/pakfire/db/rootfiles/ipfireseeder
grep -v "IPFireSeeder" /var/ipfire/xtaccess/config > /var/ipfire/xtaccess/config.tmp
mv /var/ipfire/xtaccess/config.tmp /var/ipfire/xtaccess/config
chown nobody:nobody /var/ipfire/xtaccess/config
chmod 644 /var/ipfire/xtaccess/config
rm -f /etc/rc.d/rc?.d/???ipfireseeder
rm -f /etc/rc.d/init.d/networking/red.*/??-?-ipfireseeder
remove_files

2
src/paks/ipfireseeder/update.sh
View File

@@ -22,5 +22,5 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
/etc/init.d/ipfireseeder stop
./uninstall.sh
./install.sh

2
src/ppp/ip-up
View File

@@ -74,7 +74,7 @@ else
echo "$FIRE gateway" >> /tmp/hosts
else
#DNS lookup failed use direct ip
echo "85.88.28.125 gateway" >> /tmp/hosts
echo "178.63.73.246 gateway" >> /tmp/hosts
fi
fi
mv /tmp/hosts /etc/hosts