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

convert-dns-settings: remove DNS settings also if no server config is generated

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2020-01-28 20:31:22 +00:00
parent 3ee6ac9dad
commit 15e3419434
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/scripts/convert-dns-settings
View File

@@ -19,6 +19,12 @@
# #
###############################################################################
FILES=(
/var/ipfire/ethernet/settings
/var/ipfire/dns/settings
/var/ipfire/ppp/settings-*
)
main() {
# Do not convert anything if we already have some servers set
if [ ! -s "/var/ipfire/dns/servers" ]; then
@@ -27,7 +33,7 @@ main() {
# Loop through all PPP profiles
local file
for file in /var/ipfire/ethernet/settings /var/ipfire/dns/settings /var/ipfire/ppp/settings-*; do
for file in "${FILES[@]}"; do
if [ -s "${file}" ]; then
local DNS0 DNS1 DNS2
eval $(/usr/local/bin/readhash "${file}")
@@ -37,9 +43,6 @@ main() {
for var in DNS0 DNS1 DNS2; do
SERVERS+=( "${!var}" )
done
# Remove DNS, DNS0, DNS1 and DNS2 settings from profile file
sed -Ei "/^DNS[012]?=/d" "${file}"
fi
done
@@ -62,6 +65,13 @@ main() {
fi
fi
# Remove all old settings from files
local file
for file in "${FILES[@]}"; do
# Remove DNS, DNS0, DNS1 and DNS2
sed -Ei "/^DNS[012]?=/d" "${file}"
done
# Set correct ownership.
chown nobody:nobody /var/ipfire/dns/settings