From 76f57a4d4ca7b8c73f971258ff3815f488fcc4f3 Mon Sep 17 00:00:00 2001
From: Benoit <forgejo@benoit.jp.net>
Date: Sat, 15 Feb 2025 12:52:07 +0900
Subject: [PATCH] Adguard: Revamp

---
 cfg/jobs/adguard.run | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/cfg/jobs/adguard.run b/cfg/jobs/adguard.run
index 961e4b3..f7e6672 100755
--- a/cfg/jobs/adguard.run
+++ b/cfg/jobs/adguard.run
@@ -7,10 +7,10 @@ DIST="${IMAGE%%/*}"
 VER="${IMAGE#*/}"
 VER="${VER%/*}"
 VER="${VER//./-}"
-UPSTREAM_VER="0.107.54"
+UPSTREAM_VER="0.107.56"
 UPSTREAM_VER_DASH="${UPSTREAM_VER//./-}"
 UPSTREAM_NAME="adguard"
-SERIAL="4benoitjpnet"
+SERIAL="1benoitjpnet"
 CNAME="$UPSTREAM_NAME-$UPSTREAM_VER_DASH-$SERIAL-$DIST-$VER"
 ALIAS="$UPSTREAM_NAME-$UPSTREAM_VER-$SERIAL"
 
@@ -19,11 +19,15 @@ incus launch images:$IMAGE "$CNAME" --quiet
 
 wait_network "$CNAME"
 
-incus exec "$CNAME" -- bash -c '
-apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends wget
+incus config set "$CNAME" environment.DEBIAN_FRONTEND=noninteractive
+incus config set "$CNAME" environment.DEBCONF_NONINTERACTIVE_SEEN=true
+incus config set "$CNAME" environment.LC_ALL=C
 
-adduser \
-  --system \
+incus exec "$CNAME" -- apt-get update
+incus exec "$CNAME" -- apt-get upgrade -y
+incus exec "$CNAME" -- apt-get install -y --no-install-recommends wget
+
+incus exec "$CNAME" -- adduser \
   --shell /bin/bash \
   --gecos "AdGuard Home DNS Server" \
   --group \
@@ -31,24 +35,20 @@ adduser \
   --home /opt/adguard \
   adguard
 
-cd /tmp && \
-wget --quiet https://github.com/AdguardTeam/AdGuardHome/releases/download/v'"$UPSTREAM_VER"'/AdGuardHome_linux_amd64.tar.gz && \
-tar -xzf AdGuardHome_linux_amd64.tar.gz -C /opt/adguard --strip-components=2 && \
-rm AdGuardHome_linux_amd64.tar.gz
+incus exec "$CNAME" -- cd /tmp
+incus exec "$CNAME" -- wget --quiet https://github.com/AdguardTeam/AdGuardHome/releases/download/v"$UPSTREAM_VER"/AdGuardHome_linux_amd64.tar.gz
+incus exec "$CNAME" -- tar -xzf AdGuardHome_linux_amd64.tar.gz -C /opt/adguard --strip-components=2
+incus exec "$CNAME" -- rm AdGuardHome_linux_amd64.tar.gz
+incus exec "$CNAME" -- 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 <<EOT> /etc/systemd/resolved.conf.d/adguardhome.conf
+incus exec "$CNAME" -- mkdir -p /etc/systemd/resolved.conf.d
+incus exec "$CNAME" -- bash -c 'cat << EOT > /etc/systemd/resolved.conf.d/adguardhome.conf
 [Resolve]
 DNS=127.0.0.1
 DNSStubListener=no
-EOT
-'
+EOT'
 
-incus file push adguard.service "$CNAME"/etc/systemd/system/
-incus exec "$CNAME" -- systemctl enable adguard
+incus exec "$CNAME" -- /opt/adguard/AdGuardHome -s install
 
 laminarc run incus_publish \
   CNAME="$CNAME" \