Fixed systemd service file, adjusted `/etc/gnunet.conf`, improved `gnunet.install`

5 files changed, 11 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fc318cedcba..464ea610fb5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnunet
 	pkgdesc = A framework for secure peer-to-peer networking
 	pkgver = 0.15.0
-	pkgrel = 5
+	pkgrel = 6
 	url = http://gnunet.org
 	install = gnunet.install
 	arch = i686
@@ -54,9 +54,9 @@ pkgbase = gnunet
 	validpgpkeys = 3D11063C10F98D14BD24D1470B0998EF86F59B6A
 	sha256sums = cca23d6fb40890a5eb2ccae4b8f7e74c8e4e84d3fca2f419d775cb4a58dd9a67
 	sha256sums = SKIP
-	sha256sums = 2fb156b5bda51ef7c0659ca19113e7c8cd651637ffb379264e2b61f65be367d1
+	sha256sums = 577a6fd803d7f2a00380a200778dc0515efb26011e5b8ea4888554e7216a9042
 	sha256sums = 65daa9fb07bdc8b8a11ca06f320b94ce6cfcc9681c6693ac655ca54881645a39
 	sha256sums = 4832e45c02ad768a713ca7f2a04b58794e268a49130b5b8ab6b91917e3d4f945
-	sha256sums = 6453b443ff660e5dd1bdcb6afcd4fc781ca128263faeda9cb50101911a0779d2
+	sha256sums = 434d2389264ffdb524147679d5b8a27a568521be4945fb08455c8fcdb8dac0ae
 
 pkgname = gnunet
diff --git a/PKGBUILD b/PKGBUILD
index d6251013ab69..b9243c97a7c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname='gnunet'
 pkgver='0.15.0'
-pkgrel=5
+pkgrel=6
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
 url="http://${pkgname}.org"
@@ -38,10 +38,10 @@ validpgpkeys=('19647543F7861D3BF4E64FF7BF60708B48426C7E'
               '3D11063C10F98D14BD24D1470B0998EF86F59B6A')
 sha256sums=('cca23d6fb40890a5eb2ccae4b8f7e74c8e4e84d3fca2f419d775cb4a58dd9a67'
             'SKIP'
-            '2fb156b5bda51ef7c0659ca19113e7c8cd651637ffb379264e2b61f65be367d1'
+            '577a6fd803d7f2a00380a200778dc0515efb26011e5b8ea4888554e7216a9042'
             '65daa9fb07bdc8b8a11ca06f320b94ce6cfcc9681c6693ac655ca54881645a39'
             '4832e45c02ad768a713ca7f2a04b58794e268a49130b5b8ab6b91917e3d4f945'
-            '6453b443ff660e5dd1bdcb6afcd4fc781ca128263faeda9cb50101911a0779d2')
+            '434d2389264ffdb524147679d5b8a27a568521be4945fb08455c8fcdb8dac0ae')
 
 prepare() {
 
diff --git a/gnunet.conf b/gnunet.conf
index 91823edb23b6..f937c47b7701 100644
--- a/gnunet.conf
+++ b/gnunet.conf
@@ -3,8 +3,8 @@
 # If 'DEFAULTCONFIG' is not defined, the current
 # configuration file is assumed to be the default,
 # which is what we want by default...
-SERVICEHOME = /var/lib/gnunet/
-# SERVICEHOME = ~/.gnunet/
+SERVICEHOME = ~/.gnunet/
+# SERVICEHOME = /var/lib/gnunet/
 LIBEXECDIR = /usr/lib/gnunet/libexec/
 DOCDIR = /usr/share/doc/gnunet/
 ICONDIR = /usr/share/icons/
diff --git a/gnunet.install b/gnunet.install
index 35d567687c54..feb95762e093 100644
--- a/gnunet.install
+++ b/gnunet.install
@@ -1,6 +1,6 @@
 _gnunet_setuid() {
 	getent group gnunetdns > /dev/null || groupadd -r gnunetdns
-	getent passwd gnunet > /dev/null || useradd -r -l -d /var/lib/gnunet -s /bin/sh gnunet
+	getent passwd gnunet > /dev/null || useradd -r -U -l -d /var/lib/gnunet -s /bin/sh -c "GNUnet" gnunet
 	local GNUNETDNS_GROUP="$(getent group gnunetdns | cut -d: -f3)"
 	chown root:root /usr/lib/gnunet/libexec/gnunet-helper-vpn
 	chmod u+s /usr/lib/gnunet/libexec/gnunet-helper-vpn
diff --git a/gnunet.service b/gnunet.service
index f4bf3a2d326e..1083fdf4fa44 100644
--- a/gnunet.service
+++ b/gnunet.service
@@ -4,8 +4,8 @@ Description=A framework for secure peer-to-peer networking
 [Service]
 User=gnunet
 Type=forking
-ExecStart=/usr/bin/gnunet-arm -s -c /etc/gnunetd.conf
-ExecStop=/usr/bin/gnunet-arm -e -c /etc/gnunetd.conf
+ExecStart=/usr/bin/gnunet-arm -s -c /etc/gnunet.conf
+ExecStop=/usr/bin/gnunet-arm -e -c /etc/gnunet.conf
 GuessMainPID=no
 
 [Install]