From 8b4f8140f9e4fec996484c24568475599229a303 Mon Sep 17 00:00:00 2001
From: AiutoPcAmico <98831402+AiutoPcAmico@users.noreply.github.com>
Date: Fri, 29 Dec 2023 16:01:50 +0100
Subject: [PATCH] moved variable greylistDisabled to another file Re-Added
 installation of systemd-resolved, but moved after bind9 installation

---
 setup/functions.sh        | 1 -
 setup/global-variables.sh | 2 ++
 setup/start.sh            | 1 +
 setup/system.sh           | 7 +++++--
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 setup/global-variables.sh

diff --git a/setup/functions.sh b/setup/functions.sh
index cbd0bd7d..54885d9a 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -6,7 +6,6 @@ set -euo pipefail
 
 # START AiutoPcAmico modification
 PHP_VER=8.2
-greylistDisabled=false
 # END AiutoPcAmico modification
 
 function hide_output {
diff --git a/setup/global-variables.sh b/setup/global-variables.sh
new file mode 100644
index 00000000..5a3586fd
--- /dev/null
+++ b/setup/global-variables.sh
@@ -0,0 +1,2 @@
+# START AiutoPcAmico modification
+greylistDisabled=false
diff --git a/setup/start.sh b/setup/start.sh
index fe6c0378..62789bb7 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -3,6 +3,7 @@
 #####################################################
 
 source setup/functions.sh # load our functions
+source setup/global-variables.sh # load AiutoPcAmico variables for settings 
 
 
 # START AiutoPcAmico modification
diff --git a/setup/system.sh b/setup/system.sh
index 0280009d..7d46b6ba 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -301,8 +301,7 @@ fi #NODOC
 #  	If more queries than specified are sent, bind9 returns SERVFAIL. After flushing the cache during system checks,
 #	we ran into the limit thus we are increasing it from 75 (default value) to 100.
 apt_install bind9
-# touch /etc/default/bind9
-# touch /etc/default/named
+
 tools/editconf.py /etc/default/named \
 	"OPTIONS=\"-u bind -4\""
 
@@ -321,9 +320,13 @@ fi
 # which is where bind9 will be running. Obviously don't do this before
 # installing bind9 or else apt won't be able to resolve a server to
 # download bind9 from.
+
+# START AiutoPcAmico modification
+apt_install systemd-resolved
 rm -f /etc/resolv.conf
 tools/editconf.py /etc/systemd/resolved.conf DNSStubListener=no
 echo "nameserver 127.0.0.1" > /etc/resolv.conf
+# END AiutoPcAmico modification
 
 # Restart the DNS services.