Move amuled@.service to systemd user unit folder

> now, launch amuled by user is doing by: systemctl --user start amuled
> instead of systemctl start amuled@USER

6 files changed, 12 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 435f53162d93..9ba081d75991 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jul 16 01:18:43 UTC 2017
+# Sun Jul 16 11:29:35 UTC 2017
 pkgbase = amule-daemon
 	pkgdesc = An eMule-like client for the eD2k and Kademlia p2p networks. (Only Daemon, CLI tools and Webserver)
 	pkgver = r10990
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.amule.org
 	install = amule-daemon.install
 	arch = i686
@@ -21,12 +21,12 @@ pkgbase = amule-daemon
 	source = http://amule.sourceforge.net/tarballs/aMule-SVN-r10990.tar.bz2
 	source = amuled.service
 	source = amuled@.service
-	source = amuleweb.service
+	source = amulewebd.service
 	source = amule.sysuser
 	source = amule.tmpfiles
 	sha256sums = 215d65df096ecdd3f420d9b0e7b0f180c9345e7f386a8aaa45c9205f820f7c63
 	sha256sums = 835a1058ba926e4c0cfcfbd9ac2266abd057753fdf85f7bb9da7e217432e7e56
-	sha256sums = 84cde583acf2b431a6363eb9d6f6ed98177826add1f80b483da837e5fef52bf4
+	sha256sums = 52824abdd4724db7c8c4bfc05779849c06de04b4795b3d77c98de1baa3a0babc
 	sha256sums = f50c46605d3ae977913f4dcf0c7405e0bdc84322d1fc877ae851706f0e1ae5fd
 	sha256sums = bc870ebde3c5e009605ca76435790ea260a848160db643bf37e4f9de48b5e56c
 	sha256sums = 5a27c4c74640975447cf0d7826a1287155a6736bd7f9842eedc6d8af0378bba3
diff --git a/.gitignore b/.gitignore
index 21acb3453044..8c7f937bb807 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,5 @@
 !amule.tmpfiles
 !amuled.service
 !amuled@.service
-!amuleweb.service
+!amulewebd.service
 
diff --git a/PKGBUILD b/PKGBUILD
index 32e21b5e4a9d..e067859d182a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=amule-daemon
 pkgver=r10990
-pkgrel=2
+pkgrel=3
 pkgdesc='An eMule-like client for the eD2k and Kademlia p2p networks. (Only Daemon, CLI tools and Webserver)'
 url='http://www.amule.org'
 arch=('i686' 'x86_64' 'armv7h')
@@ -19,13 +19,13 @@ optdepends=('kamule: AmuleGUI for KDE')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-${pkgver}.tar.bz2"
         'amuled.service'
         'amuled@.service'
-        'amuleweb.service'
+        'amulewebd.service'
         'amule.sysuser'
         'amule.tmpfiles'
         )
 sha256sums=('215d65df096ecdd3f420d9b0e7b0f180c9345e7f386a8aaa45c9205f820f7c63'
             '835a1058ba926e4c0cfcfbd9ac2266abd057753fdf85f7bb9da7e217432e7e56'
-            '84cde583acf2b431a6363eb9d6f6ed98177826add1f80b483da837e5fef52bf4'
+            '52824abdd4724db7c8c4bfc05779849c06de04b4795b3d77c98de1baa3a0babc'
             'f50c46605d3ae977913f4dcf0c7405e0bdc84322d1fc877ae851706f0e1ae5fd'
             'bc870ebde3c5e009605ca76435790ea260a848160db643bf37e4f9de48b5e56c'
             '5a27c4c74640975447cf0d7826a1287155a6736bd7f9842eedc6d8af0378bba3'
@@ -67,8 +67,8 @@ package() {
   install -Dm755 "aMule-SVN-${pkgver}/src/utils/scripts/kadnodescreate.pl" "${pkgdir}/usr/share/amule/kadnodescreate.pl"
 
   install -Dm644 "${srcdir}/amuled.service" "${pkgdir}/usr/lib/systemd/system/amuled.service"
-  install -Dm644 "${srcdir}/amuled@.service" "${pkgdir}/usr/lib/systemd/system/amuled@.service"
-  install -Dm644 "${srcdir}/amuleweb.service" "${pkgdir}/usr/lib/systemd/system/amuleweb.service"
+  install -Dm644 "${srcdir}/amuled@.service" "${pkgdir}/usr/lib/systemd/user/amuled.service"
+  install -Dm644 "${srcdir}/amulewebd.service" "${pkgdir}/usr/lib/systemd/system/amuleweb.service"
   install -Dm644 "${srcdir}/amule.sysuser" "${pkgdir}/usr/lib/sysusers.d/amule.conf"
   install -Dm644 "${srcdir}/amule.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/amule.conf"
 
diff --git a/amule-daemon.install b/amule-daemon.install
index d92d6b84d20b..71e39e752f84 100644
--- a/amule-daemon.install
+++ b/amule-daemon.install
@@ -11,8 +11,8 @@ _instructions() {
   ${blue}->${all_off} You also need to specify amuleweb password.
      Please follow ${bold}https://wiki.archlinux.org/index.php/AMule${all_off} for more information.
   ${blue}->${all_off} Service '${bold}amuled${all_off}' can be started as '${bold}systemctl start amuled${all_off}'.
-  ${blue}->${all_off} Service '${bold}amuled@${all_off}' (by user) can be started as '${bold}systemctl start amuled@USER${all_off}'
-  ${blue}->${all_off} Service '${bold}amuleweb${all_off}' can be started as '${bold}systemctl start amuleweb${all_off}'.\n"
+  ${blue}->${all_off} Service '${bold}amuled${all_off}' (by user) can be started as '${bold}systemctl --user start amuled${all_off}'
+  ${blue}->${all_off} Service '${bold}amulewebd${all_off}' can be started as '${bold}systemctl start amulewebd${all_off}'.\n"
 }
 
 _notice_if_amuled_exist() {
diff --git a/amuled@.service b/amuled@.service
index f3d64247ba06..e1ea7aed1d22 100644
--- a/amuled@.service
+++ b/amuled@.service
@@ -3,7 +3,6 @@ Description=aMule Daemon
 After=network.target
 
 [Service]
-User=%I
 ExecStart=/usr/bin/amuled
 
 [Install]
diff --git a/amuleweb.service b/amulewebd.service
index 0da58921ba6b..0da58921ba6b 100644
--- a/amuleweb.service
+++ b/amulewebd.service