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

Compare commits

base: Benoit:5f20150c1d74be0636cc954aa2827163842a4614
Branches Tags
Benoit:main
...
compare: Benoit:f465dd19c63689d684f9a99db0d1b624a17d871e
Branches Tags
Benoit:main

3 commits
5f20150c1d ... f465dd19c6

Author SHA1 Message Date
Benoit
f465dd19c6
Adguard: Bump serial 2024-11-27 22:19:28 +09:00
Benoit
2ded8b596b
Adguard: Fix wrong path 2024-11-27 22:19:18 +09:00
Benoit
d754af7a2c
Adguard: Patch for systemd-resolved 2024-11-27 22:18:58 +09:00
2 changed files with 14 additions and 4 deletions
Show stats Expand all files Collapse all files

10
cfg/jobs/adguard.run
View file

@ -10,7 +10,7 @@ VER="${VER//./-}"
UPSTREAM_VER="0.107.54" UPSTREAM_VER="0.107.54"
UPSTREAM_VER_DASH="${UPSTREAM_VER//./-}" UPSTREAM_VER_DASH="${UPSTREAM_VER//./-}"
UPSTREAM_NAME="adguard" UPSTREAM_NAME="adguard"
SERIAL="2benoitjpnet" SERIAL="4benoitjpnet"
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"
@ -38,6 +38,14 @@ rm AdGuardHome_linux_amd64.tar.gz
setcap "CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip" /opt/adguard/AdGuardHome 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} 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
[Resolve]
DNS=127.0.0.1
DNSStubListener=no
EOT
' '
incus file push adguard.service "$CNAME"/etc/systemd/system/ incus file push adguard.service "$CNAME"/etc/systemd/system/

8
run/adguard/workspace/adguard.service
View file

@ -5,11 +5,13 @@ ConditionFileIsExecutable=/opt/adguard/AdGuardHome
After=syslog.target network-online.target After=syslog.target network-online.target
[Service] [Service]
User=adguard # First run must run as root, then chown -R adguard: /etc/adguard /opt/adguard
Group=adguard # And uncomment + restart service
#User=adguard
#Group=adguard
StartLimitInterval=5 StartLimitInterval=5
StartLimitBurst=10 StartLimitBurst=10
ExecStart=/tmp/AdGuardHome/AdGuardHome "-s" "run" "-c" "/etc/adguard/adguard.yaml" ExecStart=/opt/adguard/AdGuardHome "-s" "run" "-c" "/etc/adguard/adguard.yaml"
WorkingDirectory=/opt/adguard WorkingDirectory=/opt/adguard