Benoit/Laminar
Benoit/Laminar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adguard: Revamp

Browse source
This commit is contained in:
Benoit 2025-02-15 12:52:07 +09:00
parent 7ceda1aca9
commit 76f57a4d4c
Signed by: Benoit
SSH key fingerprint: SHA256:kFsX94Kq6z/6CY0dX+7/FpAeJC0QlMhJVY+B7NYrOmA
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
cfg/jobs/adguard.run
View file

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