From b7004ba15a3f685ebaf95c46c4abe20a0a559c9a Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Sun, 22 Dec 2019 13:15:05 -0500
Subject: [PATCH] Update to 0.100.6-2

---
 .SRCINFO            |  5 +++--
 AdGuardHome.service | 16 ++++++++--------
 PKGBUILD            |  8 ++++----
 readme.install      | 25 ++++++++++++++++++++++---
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 328fbe9..a53751f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = adguardhome
 	pkgdesc = Network-wide ads and trackers blocking DNS server
 	pkgver = 0.100.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/AdguardTeam/AdGuardHome
 	install = readme.install
 	arch = x86_64
 	license = GPL
 	makedepends = go
 	makedepends = npm
+	makedepends = git
 	source = adguardhome-0.100.6.tar.gz::https://github.com/AdguardTeam/AdGuardHome/archive/v0.100.6.tar.gz
 	source = AdGuardHome.service
 	sha256sums = d00a0dbc5e61c3743a1e8cccee345e1668cf0c51f150204c98e07e815a683410
-	sha256sums = a9b8ac4e94938b2ba24c8ac8e2d2d660ca2dbb472cc0c3d70f7cfdfa28649963
+	sha256sums = 9f47d9b2d7daad4b4db08d7cf8c10a7fb55323f40e06161a56e6fcf109f890cd
 
 pkgname = adguardhome
 
diff --git a/AdGuardHome.service b/AdGuardHome.service
index 962cd13..9a70336 100644
--- a/AdGuardHome.service
+++ b/AdGuardHome.service
@@ -1,19 +1,19 @@
 [Unit]
 Description=AdGuard Home: Network-level blocker
-ConditionFileIsExecutable=/opt/adguardhome/AdGuardHome
+ConditionFileIsExecutable=/var/lib/adguardhome/AdGuardHome
 After=syslog.target network-online.target
 
+User=adguardhome
+Group=adguardhome
+
 [Service]
 StartLimitInterval=5
 StartLimitBurst=10
-ExecStart=/opt/adguardhome/AdGuardHome "-s" "run"
+ExecStart=/var/lib/adguardhome/AdGuardHome "-s" "run"
 
-WorkingDirectory=/opt/adguardhome
-
-
-
-StandardOutput=file:/var/log/AdGuardHome.out
-StandardError=file:/var/log/AdGuardHome.err
+WorkingDirectory=/var/lib/adguardhome
+StandardOutput=file:/var/lib/adguardhome/AdGuardHome.out
+StandardError=file:/var/lib/adguardhome/AdGuardHome.err
 Restart=always
 RestartSec=10
 EnvironmentFile=-/etc/sysconfig/AdGuardHome
diff --git a/PKGBUILD b/PKGBUILD
index 620cba8..70f2f27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=adguardhome
 _pkgname=AdGuardHome
 pkgver=0.100.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Network-wide ads and trackers blocking DNS server"
 arch=('x86_64')
 url="https://github.com/AdguardTeam/AdGuardHome"
@@ -11,10 +11,10 @@ license=('GPL')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/AdguardTeam/AdGuardHome/archive/v$pkgver.tar.gz"
 $_pkgname.service
 )
-makedepends=('go' 'npm')
+makedepends=(go npm git)
 install=readme.install
 sha256sums=('d00a0dbc5e61c3743a1e8cccee345e1668cf0c51f150204c98e07e815a683410'
-            'a9b8ac4e94938b2ba24c8ac8e2d2d660ca2dbb472cc0c3d70f7cfdfa28649963')
+            '9f47d9b2d7daad4b4db08d7cf8c10a7fb55323f40e06161a56e6fcf109f890cd')
 
 build(){
   cd "$_pkgname-$pkgver"
@@ -22,6 +22,6 @@ build(){
 }
 
 package() {
-  install -Dm755 "$_pkgname-$pkgver/$_pkgname" "$pkgdir/opt/adguardhome/$_pkgname"
+  install -Dm755 "$_pkgname-$pkgver/$_pkgname" "$pkgdir/var/lib/adguardhome/$_pkgname"
   install -Dm644 "$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
 }
diff --git a/readme.install b/readme.install
index ab8b3b0..092fede 100644
--- a/readme.install
+++ b/readme.install
@@ -1,8 +1,27 @@
 post_install() {
-  if [[ ! -f /opt/adguardhome/AdGuardHome.yaml ]]; then
-    echo "==> First time use, run /opt/adguardhome/AdGuardHome as root to setup pref file"
-    echo "==> Subsequently, use the systemd service unit AdGuardHome.service"
+  getent group adguardhome > /dev/null || groupadd -g 555 adguardhome
+  if ! getent passwd adguardhome > /dev/null; then
+    useradd -c 'adguardhome user' -u 555 -g adguardhome \
+      -d /var/lib/adguardhome -s /usr/bin/nologin adguardhome
+    passwd -l adguardhome > /dev/null
+    [[ ! -d /var/lib/adguardhome/ ]] &&
+      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() {
+  echo "==> Optionally delete the adguardhome user and its home directory"
+  echo "==>   if you are certain no processes are running under it."
+  echo "==>   userdel adguardhome"
+  echo "==>   groupdel adguardhome"
+  echo "==>   rm -rf /var/lib/adguardhome"
 }
 
 # vim:set ts=2 sw=2 et: