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

up/down beep: move from ppp ip-up/down to general red.up/down

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2019-12-01 15:29:59 +01:00
parent 86409ab100
commit d346d47467
11 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/aarch64/initscripts
View File

@@ -47,6 +47,7 @@ etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
etc/rc.d/init.d/networking/red.down/10-static-routes
etc/rc.d/init.d/networking/red.down/20-firewall
etc/rc.d/init.d/networking/red.down/99-beep
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
@@ -62,6 +63,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns
etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-beep
etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update

2
config/rootfiles/common/armv5tel/initscripts
View File

@@ -47,6 +47,7 @@ etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
etc/rc.d/init.d/networking/red.down/10-static-routes
etc/rc.d/init.d/networking/red.down/20-firewall
etc/rc.d/init.d/networking/red.down/99-beep
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
@@ -62,6 +63,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns
etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-beep
etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update

2
config/rootfiles/common/i586/initscripts
View File

@@ -47,6 +47,7 @@ etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
etc/rc.d/init.d/networking/red.down/10-static-routes
etc/rc.d/init.d/networking/red.down/20-firewall
etc/rc.d/init.d/networking/red.down/99-beep
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
@@ -62,6 +63,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns
etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-beep
etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update

2
config/rootfiles/common/x86_64/initscripts
View File

@@ -47,6 +47,7 @@ etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
etc/rc.d/init.d/networking/red.down/10-static-routes
etc/rc.d/init.d/networking/red.down/20-firewall
etc/rc.d/init.d/networking/red.down/99-beep
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
@@ -62,6 +63,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns
etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-beep
etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update

4
config/rootfiles/core/139/filelists/files
View File

@@ -7,9 +7,13 @@ etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
etc/rc.d/init.d/functions
etc/rc.d/init.d/networking/red
etc/rc.d/init.d/networking/functions.network
etc/rc.d/init.d/networking/red.down/99-beep
etc/rc.d/init.d/networking/red.up/23-suricata
etc/rc.d/init.d/networking/red.up/99-beep
etc/rc.d/init.d/unbound
etc/suricata/suricata.yaml
etc/ppp/ip-down
etc/ppp/ip-up
srv/web/ipfire/cgi-bin/captive.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/mail.cgi

3
config/rootfiles/core/139/update.sh
View File

@@ -49,6 +49,9 @@ done
# Extract files
extract_files
# move nobeeps if exist
[ -e "/var/ipfire/ppp/nobeeps" ] mv /var/ipfire/ppp/nobeeps /var/ipfire/red/nobeeps
# update linker config
ldconfig

4
html/cgi-bin/gui.cgi
View File

@@ -78,9 +78,9 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
# Beep on ip-up or ip-down. Default is ON.
if ($cgiparams{'PPPUPDOWNBEEP'} ne 'on') {
$cgiparams{'PPPUPDOWNBEEP'} = 'off';
system ('/usr/bin/touch', "${General::swroot}/ppp/nobeeps");
system ('/usr/bin/touch', "${General::swroot}/red/nobeeps");
} else {
unlink "${General::swroot}/ppp/nobeeps";
unlink "${General::swroot}/red/nobeeps";
}
# write cgi vars to the file.

2
src/initscripts/networking/red.down/99-beep Normal file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
[ -e /var/ipfire/red/nobeeps ] || /etc/rc.d/init.d/beep down

2
src/initscripts/networking/red.up/99-beep Normal file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
[ -e /var/ipfire/red/nobeeps ] || /etc/rc.d/init.d/beep up

2
src/ppp/ip-down
View File

@@ -28,7 +28,5 @@ rm -f /var/ipfire/red/active
run_subdir ${rc_base}/init.d/networking/red.down/
[ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep down
[ -e "/var/ipfire/red/keepconnected" ] && \
/etc/rc.d/init.d/connectd reconnect &

2
src/ppp/ip-up
View File

@@ -79,5 +79,3 @@ else
fi
mv /tmp/hosts /etc/hosts
[ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up