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

Compare commits

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

No commits in common. "f465dd19c63689d684f9a99db0d1b624a17d871e" and "5f20150c1d74be0636cc954aa2827163842a4614" have entirely different histories.
f465dd19c6 ... 5f20150c1d

2 changed files with 4 additions and 14 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="4benoitjpnet" SERIAL="2benoitjpnet"
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,14 +38,6 @@ 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,13 +5,11 @@ ConditionFileIsExecutable=/opt/adguard/AdGuardHome
After=syslog.target network-online.target After=syslog.target network-online.target
[Service] [Service]
# First run must run as root, then chown -R adguard: /etc/adguard /opt/adguard User=adguard
# And uncomment + restart service Group=adguard
#User=adguard
#Group=adguard
StartLimitInterval=5 StartLimitInterval=5
StartLimitBurst=10 StartLimitBurst=10
ExecStart=/opt/adguard/AdGuardHome "-s" "run" "-c" "/etc/adguard/adguard.yaml" ExecStart=/tmp/AdGuardHome/AdGuardHome "-s" "run" "-c" "/etc/adguard/adguard.yaml"
WorkingDirectory=/opt/adguard WorkingDirectory=/opt/adguard