Update to 0.102.0-2

This commit is contained in:
graysky
2020-05-19 05:38:51 -04:00
parent 270c272068
commit b4d9f8e838
6 changed files with 27 additions and 22 deletions

View File

@@ -1,7 +1,7 @@
pkgbase = adguardhome pkgbase = adguardhome
pkgdesc = Network-wide ads and trackers blocking DNS server pkgdesc = Network-wide ads and trackers blocking DNS server
pkgver = 0.102.0 pkgver = 0.102.0
pkgrel = 1 pkgrel = 2
url = https://github.com/AdguardTeam/AdGuardHome url = https://github.com/AdguardTeam/AdGuardHome
install = readme.install install = readme.install
arch = x86_64 arch = x86_64
@@ -11,8 +11,12 @@ pkgbase = adguardhome
makedepends = git makedepends = git
source = adguardhome-0.102.0.tar.gz::https://github.com/AdguardTeam/AdGuardHome/archive/v0.102.0.tar.gz source = adguardhome-0.102.0.tar.gz::https://github.com/AdguardTeam/AdGuardHome/archive/v0.102.0.tar.gz
source = AdGuardHome.service source = AdGuardHome.service
source = sysusers.conf
source = tmpfiles.conf
sha256sums = ef6f12a0a61c96c82fc0a6a97ffbd6c4fdb827b1959ad3d10f8d52aaf8c51903 sha256sums = ef6f12a0a61c96c82fc0a6a97ffbd6c4fdb827b1959ad3d10f8d52aaf8c51903
sha256sums = 6a4d449f4749c5528cd324bb1bfa55090fb43a58dd3038f39f1ca9aed4a1b5ae sha256sums = 3eb76cc878f544bfc276929096c1d7d233e2e3d613886ee9a78b306ac3cd763e
sha256sums = e9a50b7004218803ecf44c0be8c7fb28d584e8b7b3a821f26ff3478816ab0afd
sha256sums = 7cacae3dad7042f331208a47f7177a27b03a45984659df900ac175d715883aad
pkgname = adguardhome pkgname = adguardhome

View File

@@ -7,16 +7,17 @@ After=syslog.target network-online.target
User=adguardhome User=adguardhome
Group=adguardhome Group=adguardhome
AmbientCapabilities=CAP_NET_BIND_SERVICE
CapabilityBoundingSet=CAP_NET_BIND_SERVICE
StartLimitInterval=5 StartLimitInterval=5
StartLimitBurst=10 StartLimitBurst=10
ExecStart=/var/lib/adguardhome/AdGuardHome "-s" "run" ExecStart=/var/lib/adguardhome/AdGuardHome -s run
WorkingDirectory=/var/lib/adguardhome WorkingDirectory=/var/lib/adguardhome
StandardOutput=file:/var/lib/adguardhome/AdGuardHome.out StandardOutput=file:/var/lib/adguardhome/AdGuardHome.out
StandardError=file:/var/lib/adguardhome/AdGuardHome.err StandardError=file:/var/lib/adguardhome/AdGuardHome.err
Restart=always Restart=always
RestartSec=10 RestartSec=10
EnvironmentFile=-/etc/sysconfig/AdGuardHome
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@@ -3,18 +3,20 @@
pkgname=adguardhome pkgname=adguardhome
_pkgname=AdGuardHome _pkgname=AdGuardHome
pkgver=0.102.0 pkgver=0.102.0
pkgrel=1 pkgrel=2
pkgdesc="Network-wide ads and trackers blocking DNS server" pkgdesc="Network-wide ads and trackers blocking DNS server"
arch=('x86_64') arch=('x86_64')
url="https://github.com/AdguardTeam/AdGuardHome" url="https://github.com/AdguardTeam/AdGuardHome"
license=('GPL') license=('GPL')
source=("$pkgname-$pkgver.tar.gz::https://github.com/AdguardTeam/AdGuardHome/archive/v$pkgver.tar.gz" source=("$pkgname-$pkgver.tar.gz::https://github.com/AdguardTeam/AdGuardHome/archive/v$pkgver.tar.gz"
$_pkgname.service "$_pkgname.service" sysusers.conf tmpfiles.conf
) )
makedepends=(go npm git) makedepends=(go npm git)
install=readme.install install=readme.install
sha256sums=('ef6f12a0a61c96c82fc0a6a97ffbd6c4fdb827b1959ad3d10f8d52aaf8c51903' sha256sums=('ef6f12a0a61c96c82fc0a6a97ffbd6c4fdb827b1959ad3d10f8d52aaf8c51903'
'6a4d449f4749c5528cd324bb1bfa55090fb43a58dd3038f39f1ca9aed4a1b5ae') '3eb76cc878f544bfc276929096c1d7d233e2e3d613886ee9a78b306ac3cd763e'
'e9a50b7004218803ecf44c0be8c7fb28d584e8b7b3a821f26ff3478816ab0afd'
'7cacae3dad7042f331208a47f7177a27b03a45984659df900ac175d715883aad')
build(){ build(){
cd "$_pkgname-$pkgver" cd "$_pkgname-$pkgver"
@@ -24,4 +26,6 @@ build(){
package() { package() {
install -Dm755 "$_pkgname-$pkgver/$_pkgname" "$pkgdir/var/lib/adguardhome/$_pkgname" install -Dm755 "$_pkgname-$pkgver/$_pkgname" "$pkgdir/var/lib/adguardhome/$_pkgname"
install -Dm644 "$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service" install -Dm644 "$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
install -Dm644 "$srcdir"/sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
install -Dm644 "$srcdir"/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
} }

View File

@@ -1,19 +1,10 @@
post_install() { post_install() {
getent group adguardhome > /dev/null || groupadd -g 555 adguardhome echo "==> FIRST TIME SETUP"
if ! getent passwd adguardhome > /dev/null; then echo ":: 1. First time run as root: /var/lib/adguardhome/AdGuardHome"
useradd -c 'adguardhome user' -u 555 -g adguardhome \ echo ":: 2. Log in to web interface to create config: http://ip.of.server:3000"
-d /var/lib/adguardhome -s /usr/bin/nologin adguardhome echo ":: Stop AdGuardHome with ctrl+c when complete"
passwd -l adguardhome > /dev/null echo ":: 3. Fix permissions: chown -R adguardhome:adguardhome /var/lib/adguardhome"
[[ ! -d /var/lib/adguardhome/ ]] && echo "==> Now you can start AdGuardHome.service via systemd and run as the unprivileged user"
mkdir /var/lib/adguardhome/ &&
chown -R adguardhome:adguardhome /var/lib/adguardhome/
fi
post_upgrade
}
post_upgrade() {
setcap CAP_NET_BIND_SERVICE=+eip /var/lib/adguardhome/AdGuardHome
} }
post_remove() { post_remove() {

3
sysusers.conf Normal file
View File

@@ -0,0 +1,3 @@
g adguardhome - -
u adguardhome - "adguardhome user" /var/lib/adguardhome
m adguardhome adguardhome

2
tmpfiles.conf Normal file
View File

@@ -0,0 +1,2 @@
d /var/lib/adguardhome 0750 adguardhome adguardhome - -
Z /var/lib/adguardhome - adguardhome adguardhome - -