From d754af7a2cf458c6299d33895105b628a3489b5b Mon Sep 17 00:00:00 2001 From: Benoit Date: Wed, 27 Nov 2024 22:18:58 +0900 Subject: [PATCH] Adguard: Patch for systemd-resolved --- cfg/jobs/adguard.run | 8 ++++++++ run/adguard/workspace/adguard.service | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cfg/jobs/adguard.run b/cfg/jobs/adguard.run index ec5ca6d..b94a8ac 100755 --- a/cfg/jobs/adguard.run +++ b/cfg/jobs/adguard.run @@ -38,6 +38,14 @@ rm AdGuardHome_linux_amd64.tar.gz setcap "CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip" /opt/adguard/AdGuardHome install -d -m 755 -o adguard -g adguard /opt/adguard/{data,config} + +#https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ#bindinuse +mkdir -p /etc/systemd/resolved.conf.d +cat < /etc/systemd/resolved.conf.d/adguardhome.conf +[Resolve] +DNS=127.0.0.1 +DNSStubListener=no +EOT ' incus file push adguard.service "$CNAME"/etc/systemd/system/ diff --git a/run/adguard/workspace/adguard.service b/run/adguard/workspace/adguard.service index 331014e..7e19900 100644 --- a/run/adguard/workspace/adguard.service +++ b/run/adguard/workspace/adguard.service @@ -5,8 +5,10 @@ ConditionFileIsExecutable=/opt/adguard/AdGuardHome After=syslog.target network-online.target [Service] -User=adguard -Group=adguard +# First run must run as root, then chown -R adguard: /etc/adguard /opt/adguard +# And uncomment + restart service +#User=adguard +#Group=adguard StartLimitInterval=5 StartLimitBurst=10 ExecStart=/tmp/AdGuardHome/AdGuardHome "-s" "run" "-c" "/etc/adguard/adguard.yaml"