From d346d474677b9507fce16ee2d2774435658d6ba1 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 1 Dec 2019 15:29:59 +0100 Subject: [PATCH] up/down beep: move from ppp ip-up/down to general red.up/down Signed-off-by: Arne Fitzenreiter --- config/rootfiles/common/aarch64/initscripts | 2 ++ config/rootfiles/common/armv5tel/initscripts | 2 ++ config/rootfiles/common/i586/initscripts | 2 ++ config/rootfiles/common/x86_64/initscripts | 2 ++ config/rootfiles/core/139/filelists/files | 4 ++++ config/rootfiles/core/139/update.sh | 3 +++ html/cgi-bin/gui.cgi | 4 ++-- src/initscripts/networking/red.down/99-beep | 2 ++ src/initscripts/networking/red.up/99-beep | 2 ++ src/ppp/ip-down | 2 -- src/ppp/ip-up | 2 -- 11 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 src/initscripts/networking/red.down/99-beep create mode 100644 src/initscripts/networking/red.up/99-beep diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 8a025c3bfc..202da73720 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -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 diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 8a025c3bfc..202da73720 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -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 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 4349cd6187..9d4f7e5f39 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -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 diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 4349cd6187..9d4f7e5f39 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -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 diff --git a/config/rootfiles/core/139/filelists/files b/config/rootfiles/core/139/filelists/files index 3ab3eece1f..8557affaa5 100644 --- a/config/rootfiles/core/139/filelists/files +++ b/config/rootfiles/core/139/filelists/files @@ -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 diff --git a/config/rootfiles/core/139/update.sh b/config/rootfiles/core/139/update.sh index fb3105aa03..d0b979d6bc 100644 --- a/config/rootfiles/core/139/update.sh +++ b/config/rootfiles/core/139/update.sh @@ -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 diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi index 726abf7dee..f06b0f9238 100644 --- a/html/cgi-bin/gui.cgi +++ b/html/cgi-bin/gui.cgi @@ -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. diff --git a/src/initscripts/networking/red.down/99-beep b/src/initscripts/networking/red.down/99-beep new file mode 100644 index 0000000000..d615cb4a14 --- /dev/null +++ b/src/initscripts/networking/red.down/99-beep @@ -0,0 +1,2 @@ +#!/bin/bash +[ -e /var/ipfire/red/nobeeps ] || /etc/rc.d/init.d/beep down diff --git a/src/initscripts/networking/red.up/99-beep b/src/initscripts/networking/red.up/99-beep new file mode 100644 index 0000000000..6e4b08c59a --- /dev/null +++ b/src/initscripts/networking/red.up/99-beep @@ -0,0 +1,2 @@ +#!/bin/bash +[ -e /var/ipfire/red/nobeeps ] || /etc/rc.d/init.d/beep up diff --git a/src/ppp/ip-down b/src/ppp/ip-down index c7bbdbf4e5..ea0dcbf94e 100644 --- a/src/ppp/ip-down +++ b/src/ppp/ip-down @@ -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 & diff --git a/src/ppp/ip-up b/src/ppp/ip-up index b059a297d1..c7357708a6 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -79,5 +79,3 @@ else fi mv /tmp/hosts /etc/hosts -[ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up - -- 2.39.2