From 9d6e276c1877eb17d746e700a7bfdeae0778ee5f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 13 Aug 2018 16:14:07 +0100
Subject: [PATCH] Insert blocked domains into webadmin
---
src/freedombone-installer | 3 ++-
src/freedombone-utils-firewall | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index 2773e4260..b11cf866e 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -1211,7 +1211,8 @@ function regenerate_blocklist {
webadmin_install_dir="/var/www/${local_hostname}/htdocs/admin"
if [ -f "$webadmin_install_dir/blocking_template.html" ]; then
cp "$webadmin_install_dir/blocking_template.html" "$webadmin_install_dir/blocking.html"
- blockedlist=$(cat "$FIREWALL_DOMAINS")
+ blockedlist=$(sed 's@[/\&]@\\&@g;s/$/\\/' "$FIREWALL_DOMAINS"; echo .)
+ replacement=${replacement%.}
sed -i "s|BLOCKEDLIST|$blockedlist|g" "$webadmin_install_dir/blocking.html"
chown www-data:www-data "$webadmin_install_dir/blocking.html"
fi
diff --git a/src/freedombone-utils-firewall b/src/freedombone-utils-firewall
index ae052f58e..f5eb55941 100755
--- a/src/freedombone-utils-firewall
+++ b/src/freedombone-utils-firewall
@@ -733,7 +733,8 @@ function regenerate_webadmin_blocklist {
webadmin_install_dir="/var/www/${local_hostname}/htdocs/admin"
if [ -f "$webadmin_install_dir/blocking_template.html" ]; then
cp "$webadmin_install_dir/blocking_template.html" "$webadmin_install_dir/blocking.html"
- blockedlist=$(cat "$FIREWALL_DOMAINS")
+ blockedlist=$(sed 's@[/\&]@\\&@g;s/$/\\/' "$FIREWALL_DOMAINS"; echo .)
+ replacement=${replacement%.}
sed -i "s|BLOCKEDLIST|$blockedlist|g" "$webadmin_install_dir/blocking.html"
chown www-data:www-data "$webadmin_install_dir/blocking.html"
fi
--
GitLab