Date: Sunday, October 27, 2013 @ 15:10:11 Author: giovanni Revision: 197596
upgpkg: amule 10808-2 Fixed FS35728 Added: amule/trunk/amule.install amule/trunk/amuled.systemd amule/trunk/amuleweb.systemd Modified: amule/trunk/PKGBUILD ------------------+ PKGBUILD | 17 +++++++++++++---- amule.install | 29 +++++++++++++++++++++++++++++ amuled.systemd | 11 +++++++++++ amuleweb.systemd | 13 +++++++++++++ 4 files changed, 66 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-10-27 14:08:48 UTC (rev 197595) +++ PKGBUILD 2013-10-27 14:10:11 UTC (rev 197596) @@ -3,17 +3,23 @@ # Contributor: Henrik Ronellenfitsch <seari...@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> +# Contributor: Anatol Pomozov <anatol.pomo...@gmail.com> pkgname=amule pkgver=10808 -pkgrel=1 +pkgrel=2 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++') -source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('68099241871f4e47eee06bebc7ce20a1') +install=amule.install +source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2" + 'amuled.systemd' + 'amuleweb.systemd') +md5sums=('68099241871f4e47eee06bebc7ce20a1' + '59772c41860e238f1c822feb8ca8d47f' + '05975c5d94bfc41fddb894d98b1115d5') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" @@ -40,5 +46,8 @@ package() { cd "${srcdir}/aMule-SVN-r${pkgver}" - make DESTDIR=${pkgdir}/ install + make DESTDIR=${pkgdir} install + + install -D -m644 "${srcdir}/amuled.systemd" "${pkgdir}/usr/lib/systemd/system/amuled.service" + install -D -m644 "${srcdir}/amuleweb.systemd" "${pkgdir}/usr/lib/systemd/system/amuleweb.service" } Added: amule.install =================================================================== --- amule.install (rev 0) +++ amule.install 2013-10-27 14:10:11 UTC (rev 197596) @@ -0,0 +1,29 @@ +post_install() { + post_upgrade + passwd -l amule &>/dev/null +} + +_config_instructions() { + echo "If you plan to use external client (e.g. amuleGUI or amuleweb) then you need to" + echo "provide [ExternalConnect] configuration." + echo "You also need to specify amuleweb password." + echo "Please follow https://wiki.archlinux.org/index.php/AMule for more information." + echo "amuleweb can be started as 'systemctl start amuleweb'." +} + +post_upgrade() { + # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files + getent group amule >/dev/null || groupadd amule + getent passwd amule >/dev/null || useradd -c 'aMule Client' -g amule -d '/var/lib/amule' -m -s /bin/false amule + + if [ ! -e /var/lib/amule/.aMule/amule.conf ]; then + _config_instructions + fi +} + +post_remove() { + # TOTHINK: delete homedir and user account/group? + #getent passwd amule >/dev/null && userdel amule + #getent group amule >/dev/null && groupdel amule + true +} Added: amuled.systemd =================================================================== --- amuled.systemd (rev 0) +++ amuled.systemd 2013-10-27 14:10:11 UTC (rev 197596) @@ -0,0 +1,11 @@ +[Unit] +Description=aMule Daemon +After=network.target + +# This assumes that a user 'amule' exists, with a writeable home directory +[Service] +User=amule +ExecStart=/usr/bin/amuled + +[Install] +WantedBy=multi-user.target Added: amuleweb.systemd =================================================================== --- amuleweb.systemd (rev 0) +++ amuleweb.systemd 2013-10-27 14:10:11 UTC (rev 197596) @@ -0,0 +1,13 @@ +[Unit] +Description=aMule Webserver +Requires=amuled.service + +[Service] +User=amule +ExecStart=/usr/bin/amuleweb --quiet +# If amuled still starting then amuleweb exits, restart until amuleweb is up +Restart=on-success +RestartSec=3s + +[Install] +WantedBy=multi-user.target