changed to system service

8 files changed, 27 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14a525df1e73..371f105e8857 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = airdcpp-webclient-git
 	pkgdesc = A peer-to-peer file sharing client with web user interface.
 	pkgver = r2725.1a932a46
-	pkgrel = 1
+	pkgrel = 2
 	url = https://airdcpp-web.github.io
 	install = airdcpp.install
 	arch = i686
@@ -20,12 +20,14 @@ pkgbase = airdcpp-webclient-git
 	depends = intel-tbb
 	source = git+https://github.com/airdcpp-web/airdcpp-webclient.git
 	source = airdcpp.service
-	source = airdcpp-system.socket
-	source = airdcpp-user.socket
+	source = airdcpp.socket
+	source = airdcpp.sysusers
+	source = airdcpp.tmpfiles
 	sha256sums = SKIP
-	sha256sums = c7127ba4f361eb156b436791f7aa486636959bfe4d6d8e772e220beb4db04d30
-	sha256sums = 452e4689a9b62c4e1c5cb30c79e2720946c8460d5228c6697444abbfbcc4bf68
+	sha256sums = 6fe0977db676dc4fdcd872ed866b4d8189a4800e0c96ef0c7f2ba57c93a6ff19
 	sha256sums = 452e4689a9b62c4e1c5cb30c79e2720946c8460d5228c6697444abbfbcc4bf68
+	sha256sums = 4de13425653648ee086b924310e025b365eb0ee06c271a8f02f4161c828b4d96
+	sha256sums = b8dd6c435e1140c169211c36fdded45a8bd8e675f7b78b2db769aaa05b176659
 
 pkgname = airdcpp-webclient-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e3f2ac78cdd6..7c408820d4f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Zdenek Janecek <ycdmdj@gmail.com>
 pkgname=airdcpp-webclient-git
 pkgver=r2725.1a932a46
-pkgrel=1
+pkgrel=2
 _gitname=airdcpp-webclient
 pkgdesc="A peer-to-peer file sharing client with web user interface."
 arch=('i686' 'x86_64' 'armv7h')
@@ -11,12 +11,14 @@ depends=('miniupnpc' 'boost' 'openssl' 'geoip' 'leveldb' 'websocketpp' 'libnatpm
 makedepends=('cmake' 'git')
 source=('git+https://github.com/airdcpp-web/airdcpp-webclient.git'
         'airdcpp.service'
-        'airdcpp-system.socket'
-        'airdcpp-user.socket')
+        'airdcpp.socket'
+        'airdcpp.sysusers'
+        'airdcpp.tmpfiles')
 sha256sums=('SKIP'
-            'c7127ba4f361eb156b436791f7aa486636959bfe4d6d8e772e220beb4db04d30'
+            '6fe0977db676dc4fdcd872ed866b4d8189a4800e0c96ef0c7f2ba57c93a6ff19'
             '452e4689a9b62c4e1c5cb30c79e2720946c8460d5228c6697444abbfbcc4bf68'
-            '452e4689a9b62c4e1c5cb30c79e2720946c8460d5228c6697444abbfbcc4bf68')
+            '4de13425653648ee086b924310e025b365eb0ee06c271a8f02f4161c828b4d96'
+            'b8dd6c435e1140c169211c36fdded45a8bd8e675f7b78b2db769aaa05b176659')
 
 install=airdcpp.install
 
@@ -41,8 +43,8 @@ package() {
   rmdir ${pkgdir}/usr/lib64
 
   cd ..
-  install -d -g 170 -o 170 ${pkgdir}/var/lib/airdcpp
-  install -Dm644 airdcpp.service ${pkgdir}/usr/lib/systemd/user/airdcpp.service
-  install -Dm644 airdcpp-system.socket ${pkgdir}/usr/lib/systemd/system/airdcpp.socket
-  install -Dm644 airdcpp-user.socket ${pkgdir}/usr/lib/systemd/user/airdcpp.socket
+  install -Dm644 airdcpp.service ${pkgdir}/usr/lib/systemd/system/airdcpp.service
+  install -Dm644 airdcpp.socket ${pkgdir}/usr/lib/systemd/system/airdcpp.socket
+  install -Dm644 airdcpp.sysusers ${pkgdir}/usr/lib/sysusers.d/airdcpp.conf
+  install -Dm644 airdcpp.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/airdcpp.conf
 }
diff --git a/airdcpp-user.socket b/airdcpp-user.socket
deleted file mode 100644
index 236735cb0a88..000000000000
--- a/airdcpp-user.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=AirDC++ Web Client Daemon socket
-
-[Socket]
-ListenStream=5600
-Service=airdcpp.service
-
-[Install]
-WantedBy=multi-user.target
diff --git a/airdcpp.install b/airdcpp.install
index 9214e799c56b..8a0672309163 100644
--- a/airdcpp.install
+++ b/airdcpp.install
@@ -1,15 +1,5 @@
 post_install() {
-	getent group airdcpp &>/dev/null || groupadd -r -g 170 airdcpp >/dev/null
-	getent passwd airdcpp &>/dev/null || useradd -r -u 170 -g airdcpp -d /var/lib/airdcpp -s /bin/false airdcpp >/dev/null
-	true
-	
-	echo "Create configuration and enable user service by:"
-	echo "$ airdcppd --configure"
-	echo "$ systemctl --user enable airdcpp"
-}
-
-post_remove() {
-	getent passwd airdcpp &>/dev/null && userdel airdcpp >/dev/null
-	getent group airdcpp &>/dev/null && groupdel airdcpp >/dev/null
-	true
+  echo "Enable service by:"
+  echo "# su -s /bin/bash -c 'exec airdcppd -c=/var/lib/airdcpp --configure' airdcpp"
+  echo "# systemctl enable airdcpp"
 }
diff --git a/airdcpp.service b/airdcpp.service
index a7b5b8f79a57..7a5c66db0ef4 100644
--- a/airdcpp.service
+++ b/airdcpp.service
@@ -1,8 +1,11 @@
 [Unit]
 Description=AirDC++ Web Client Daemon
+After=network.target
 
 [Service]
-ExecStart=/usr/bin/airdcppd
+Type=simple
+User=airdcpp
+ExecStart=/usr/bin/airdcppd -c=/var/lib/airdcpp
 
 [Install]
 WantedBy=multi-user.target
diff --git a/airdcpp-system.socket b/airdcpp.socket
index 236735cb0a88..236735cb0a88 100644
--- a/airdcpp-system.socket
+++ b/airdcpp.socket
diff --git a/airdcpp.sysusers b/airdcpp.sysusers
new file mode 100644
index 000000000000..72be65a2cce5
--- /dev/null
+++ b/airdcpp.sysusers
@@ -0,0 +1 @@
+u airdcpp 170 "AirDC++ Daemon" /var/lib/airdcpp
diff --git a/airdcpp.tmpfiles b/airdcpp.tmpfiles
new file mode 100644
index 000000000000..bf80663a1c21
--- /dev/null
+++ b/airdcpp.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/airdcpp 0750 airdcpp airdcpp