back to pihole user

6 files changed, 27 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 559fcc4c003a..6c8238f56181 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pi-hole-ftl
 	pkgdesc = The Pi-hole FTL engine
 	pkgver = 4.3.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/pi-hole/FTL
 	install = pi-hole-ftl.install
 	arch = i686
@@ -19,17 +19,19 @@ pkgbase = pi-hole-ftl
 	backup = etc/pihole/pihole-FTL.conf
 	backup = etc/pihole/pihole-FTL.db
 	source = https://github.com/pi-hole/FTL/archive/v4.3.1.tar.gz
-	source = arch-ftl-4.3.1-705658056.patch::https://raw.githubusercontent.com/max72bra/pi-hole-ftl-archlinux-customization/master/arch-ftl-4.3.1.patch
+	source = arch-ftl-4.3.1-971416132.patch::https://raw.githubusercontent.com/max72bra/pi-hole-ftl-archlinux-customization/master/arch-ftl-4.3.1.patch
 	source = nettle35.patch
 	source = pi-hole-ftl.tmpfile
+	source = pi-hole-ftl.sysuser
 	source = pi-hole-ftl.service
 	source = pi-hole-ftl.db
 	source = pi-hole-ftl.conf
 	md5sums = 1c0df5fa42e7f7b89c7e704fdc1b5154
 	md5sums = 882b825fe87e614d2c9be7ab63d24ab1
 	md5sums = f6f3d969e1517ff46f9e0ef2e2af4ab9
-	md5sums = 5faa64558cc0a5888923fcf77c299fa7
-	md5sums = f3e42ec6f04180c6d6972998bf172a41
+	md5sums = ca844c23699ba64777571253bc7ccb21
+	md5sums = 68e78907dc2a0c89421d02377e76d353
+	md5sums = 959df75dcc4ecb06040200e7f4621339
 	md5sums = 0495c002b7d5dce303d451e4cd2fede5
 	md5sums = a9c8de83f02d36bfe96db57975984bbb
 
diff --git a/PKGBUILD b/PKGBUILD
index 314e10f1fb1e..cc0c0307a0d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pi-hole-ftl
 _pkgname=FTL
 _servicename=pihole-FTL
 pkgver=4.3.1
-pkgrel=3
+pkgrel=4
 _now=`date +%N`
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc="The Pi-hole FTL engine"
@@ -21,14 +21,16 @@ source=("https://github.com/pi-hole/FTL/archive/v$pkgver.tar.gz"
         arch-ftl-$pkgver-$_now.patch::"https://raw.githubusercontent.com/max72bra/pi-hole-ftl-archlinux-customization/master/arch-ftl-$pkgver.patch"
         "nettle35.patch"
         "$pkgname.tmpfile"
+        "$pkgname.sysuser"
         "$pkgname.service"
         "$pkgname.db"
         "$pkgname.conf")
 md5sums=('1c0df5fa42e7f7b89c7e704fdc1b5154'
          '882b825fe87e614d2c9be7ab63d24ab1'
          'f6f3d969e1517ff46f9e0ef2e2af4ab9'
-         '5faa64558cc0a5888923fcf77c299fa7'
-         'f3e42ec6f04180c6d6972998bf172a41'
+         'ca844c23699ba64777571253bc7ccb21'
+         '68e78907dc2a0c89421d02377e76d353'
+         '959df75dcc4ecb06040200e7f4621339'
          '0495c002b7d5dce303d451e4cd2fede5'
          'a9c8de83f02d36bfe96db57975984bbb')
 
@@ -48,6 +50,7 @@ package() {
   install -Dm755 "$_pkgname"-$pkgver/pihole-FTL "${pkgdir}"/usr/bin/pihole-FTL
   
   install -Dm644 "$pkgname.tmpfile" "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
+  install -Dm644 "$pkgname.sysuser" "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf
 
   install -dm755 "$pkgdir"/etc/pihole
   install -Dm644 "$pkgname.conf" "$pkgdir"/etc/pihole/pihole-FTL.conf
diff --git a/pi-hole-ftl.install b/pi-hole-ftl.install
index 133aa7fee7c8..6ed90436253a 100644
--- a/pi-hole-ftl.install
+++ b/pi-hole-ftl.install
@@ -1,6 +1,6 @@
 post_install() {
   # ftl DB permissions
-  [ -e /etc/pihole/pihole-FTL.db ] && chown nobody.nobody /etc/pihole /etc/pihole/pihole-FTL.db
+  [ -e /etc/pihole/pihole-FTL.db ] && chown pihole.pihole /etc/pihole /etc/pihole/pihole-FTL.db
 
   echo -e "\e[1;33m==>\e[0m Possible configurations in \e[1;31m/etc/pihole/pihole-FTL.conf\e[0m file"
   echo -e "\e[1;33m==>\e[0m Please read the instructions on the project page: \e[1;36mhttps://docs.pi-hole.net/ftldns/configfile/\e[0m"
diff --git a/pi-hole-ftl.service b/pi-hole-ftl.service
index 0832ef9645f4..ffe64dbe79df 100644
--- a/pi-hole-ftl.service
+++ b/pi-hole-ftl.service
@@ -1,10 +1,18 @@
 [Unit]
 Description=Pi-hole FTLDNS engine
+After=network.target
 
 [Service]
+User=pihole
+Group=pihole
 PIDFile=/run/pihole-ftl/pihole-FTL.pid
+ExecStartPre=/bin/chown -R pihole:pihole /etc/pihole
 ExecStart=/usr/bin/pihole-FTL no-daemon
+ExecReload=/bin/kill -USR1 $MAINPID
 Restart=on-failure
+TimeoutStopSec=5s
+PermissionsStartOnly=true
+AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_NET_ADMIN
      
 [Install]
 WantedBy=multi-user.target
diff --git a/pi-hole-ftl.sysuser b/pi-hole-ftl.sysuser
new file mode 100644
index 000000000000..12add1fcd4fc
--- /dev/null
+++ b/pi-hole-ftl.sysuser
@@ -0,0 +1 @@
+u pihole - "pihole daemon" /
diff --git a/pi-hole-ftl.tmpfile b/pi-hole-ftl.tmpfile
index 276250c927f8..dee8851cf1d0 100644
--- a/pi-hole-ftl.tmpfile
+++ b/pi-hole-ftl.tmpfile
@@ -1,5 +1,5 @@
-d /run/log/pihole-ftl 0755 nobody nobody - -
-f /run/log/pihole-ftl/pihole-FTL.log 0644 nobody nobody - -
-d /run/pihole-ftl 0755 nobody nobody - -
-f /run/pihole-ftl/pihole-FTL.pid 0644 nobody nobody - -
-f /run/pihole-ftl/pihole-FTL.port 0644 nobody nobody - -
+d /run/log/pihole-ftl 0755 pihole pihole - -
+f /run/log/pihole-ftl/pihole-FTL.log 0644 pihole pihole - -
+d /run/pihole-ftl 0755 pihole pihole - -
+f /run/pihole-ftl/pihole-FTL.pid 0644 pihole pihole - -
+f /run/pihole-ftl/pihole-FTL.port 0644 pihole pihole - -