diff options
| author | Felix Singer | 2017-08-18 04:43:52 +0200 |
|---|---|---|
| committer | Felix Singer | 2017-08-18 04:43:52 +0200 |
| commit | e041c4be6678ca1ba726d87e7e1220b2379b5207 (patch) | |
| tree | a0fd5981902c8f13645f54675e5684683345754d | |
| parent | b70842af1bdb84f873a730053abe5b4baf08f6bb (diff) | |
| download | aur-e041c4be6678ca1ba726d87e7e1220b2379b5207.tar.gz | |
Store config file under /etc/murmur.conf
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | murmur-snapshot-minimal.install | 2 | ||||
| -rw-r--r-- | murmur.service | 2 |
3 files changed, 5 insertions, 6 deletions
@@ -13,7 +13,7 @@ makedepends=('python' 'boost') provides=("${_pkgname}=${pkgver}") conflicts=("${_pkgname}") install=murmur-snapshot-minimal.install -backup=("etc/murmur/murmur.ini") +backup=("etc/murmur.ini") source=("https://mumble.info/snapshot/mumble-${pkgver//_/\~}~snapshot.tar.gz" "murmur.service" "murmur.logrotate" @@ -39,8 +39,7 @@ package() { cat ${murmur}/release/murmurd ${murmur}/release/libmumble_proto.a > "${murmur}/release/murmurd_new" - install -m750 -d "${pkgdir}/etc/murmur" - install -m640 -D "${murmur}/scripts/murmur.ini" "${pkgdir}/etc/murmur/murmur.ini" + install -m640 -D "${murmur}/scripts/murmur.ini" "${pkgdir}/etc/murmur.ini" install -m755 -D "${murmur}/release/murmurd_new" "${pkgdir}/usr/bin/murmurd" @@ -57,7 +56,7 @@ package() { -e "s|;pidfile=|pidfile=/run/murmur/murmur.pid|" \ -e "s|;uname=|uname=murmur|" \ -e "s|;sendversion=True|sendversion=False|" \ - -i "${pkgdir}/etc/murmur/murmur.ini" + -i "${pkgdir}/etc/murmur.ini" } # vim: sw=2:ts=2 et: diff --git a/murmur-snapshot-minimal.install b/murmur-snapshot-minimal.install index a9eef6abc3d6..83968ce32b6e 100644 --- a/murmur-snapshot-minimal.install +++ b/murmur-snapshot-minimal.install @@ -4,7 +4,7 @@ post_install() { mkdir -p /var/lib/murmur /var/log/murmur /run/murmur chown murmur:murmur /var/lib/murmur /var/log/murmur /run/murmur - chown -R root:murmur /etc/murmur + chown root:murmur /etc/murmur.ini chmod 750 /var/lib/murmur /var/log/murmur chmod 755 /run/murmur diff --git a/murmur.service b/murmur.service index 2cb3396b91c9..f434a5e41411 100644 --- a/murmur.service +++ b/murmur.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/run/murmur/murmur.pid -ExecStart=/usr/bin/murmurd -ini /etc/murmur/murmur.ini +ExecStart=/usr/bin/murmurd -ini /etc/murmur.ini User=murmur Group=murmur PrivateDevices=true |