From c6000c9d9949b3326fb82f02431899ab6774b960 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 16 Dec 2012 11:51:24 +0100 Subject: big cleanup --- murmur/ChangeLog | 36 ------------- murmur/PKGBUILD | 58 -------------------- murmur/murmur-config.sh | 134 ---------------------------------------------- murmur/murmur.conf.d | 2 - murmur/murmur.dbus.conf | 22 -------- murmur/murmur.install | 33 ------------ murmur/murmur.logrotate.d | 6 --- murmur/murmur.rc.d | 41 -------------- murmur/murmur.sh | 9 ---- murmur/murmurd | 40 -------------- 10 files changed, 381 deletions(-) delete mode 100644 murmur/ChangeLog delete mode 100644 murmur/PKGBUILD delete mode 100644 murmur/murmur-config.sh delete mode 100644 murmur/murmur.conf.d delete mode 100644 murmur/murmur.dbus.conf delete mode 100644 murmur/murmur.install delete mode 100644 murmur/murmur.logrotate.d delete mode 100755 murmur/murmur.rc.d delete mode 100644 murmur/murmur.sh delete mode 100644 murmur/murmurd (limited to 'murmur') diff --git a/murmur/ChangeLog b/murmur/ChangeLog deleted file mode 100644 index 7537836..0000000 --- a/murmur/ChangeLog +++ /dev/null @@ -1,36 +0,0 @@ -2010-02-11 Otto Allmendinger - * 1.2.2-1: - bump to version 1.2.2 - -2010-01-09 Otto Allmendinger - * 1.2.1-1: - bump to version 1.2.1 - -2009-12-18 Otto Allmendinger - * 1.2.0-8: - included dbus configuration file, changed default dbus settings - - * 1.2.0-7: - included manfile - renamed binary "murmur" to "murmurd" to be consistent with manfile - changed murmur user shell to /bin/false (shell access not required anymore) - -2009-12-17 Malte Rabenseifner - * 1.2.0-6: - included manfile - using mumbles included privilige dropping - added some files to backup array - added logrotate configuration file - -2009-12-15 Otto Allmendinger - * 1.2.0-5 : - simplified dependencies - increased visibility of install messages - - * 1.2.0-4 : - added boost to makedepends - - * 1.2.0-3 : - added ChangeLog - added post_upgrade() function - added x86_64 to arch diff --git a/murmur/PKGBUILD b/murmur/PKGBUILD deleted file mode 100644 index 295560a..0000000 --- a/murmur/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# Maintainer: Otto Allmendinger -# Contributor: Malte Rabenseifner - -pkgname=murmur -pkgver=1.2.2 -pkgrel=1 -pkgdesc="The voice chat application server for Mumble" -arch=('i686' 'x86_64') -url="http://mumble.sourceforge.net" -license=('GPL') -depends=('avahi' 'lsb-release' 'protobuf' 'qt>=4.4.0') -makedepends=('boost') -conflicts=('murmur-ice' 'murmur-static' 'murmur-git') -backup=("etc/murmur.ini" - "etc/logrotate.d/murmur" - "etc/conf.d/murmur" ) -install="murmur.install" -source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz" - "murmur.rc.d" - "murmur.conf.d" - "murmur.dbus.conf" - "murmur.logrotate.d" -) - -build() { - cd ${srcdir}/mumble-$pkgver - - qmake main.pro CONFIG+="no-client no-ice" || return 1 - make || return 1 - - sed -e "1i# vi:ft=cfg" \ - -e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \ - -e "s|dbus=session|#dbus=system|" \ - -e "s|#logfile=murmur.log|logfile=/var/log/murmur/murmur.log|" \ - -e "s|#pidfile=|pidfile=/var/run/murmur/murmur.pid|" \ - -e "s|#uname=|uname=murmur|" \ - -i scripts/murmur.ini || return 1 - - install -dm755 ${pkgdir}/var/lib/murmur - install -dm755 ${pkgdir}/var/log/murmur - install -dm755 ${pkgdir}/var/run/murmur - install -Dm755 release/murmurd ${pkgdir}/usr/sbin/murmurd - install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini - install -Dm755 ${startdir}/murmur.rc.d ${pkgdir}/etc/rc.d/murmur - install -Dm644 ${startdir}/murmur.conf.d ${pkgdir}/etc/conf.d/murmur - install -Dm644 ${startdir}/murmur.dbus.conf \ - ${pkgdir}/etc/dbus-1/system.d/murmur.conf - install -Dm644 ${startdir}/murmur.logrotate.d \ - ${pkgdir}/etc/logrotate.d/murmur - install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README - install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1 -} - -md5sums=('de30ee85170e183b66568b53b04c5727' - 'a577febe880ea104a2b00582b9cb0ddd' - '11c1cc875e8021739ec2087252cf0533' - 'eddea4cdbd0bde4b960a67e16b5d5478' - 'c56726cb267ead68f37f35c28e36e6fa') diff --git a/murmur/murmur-config.sh b/murmur/murmur-config.sh deleted file mode 100644 index ebee4a4..0000000 --- a/murmur/murmur-config.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/bash -# -# -> config.sh -# -# version: 1.1 -# author: Massimo Mund -# date: 21.12.2007 -# description: a script to easily add, remove and edit users from a murmur server -# - -#information -version="1.1" - -#settings -bin="sqlite3" -dbfile="/var/lib/murmurd/murmurd.sqlite" - -function checkforsqlite() { - - if [ ! -f /usr/bin/sqlite3 ]; then - echo "it seems that there is no sqlite3 installed, which is necessary for this script! " - echo "install sqlite3 and try it again!" - exit - fi - -} - -function help () { - - echo "" - echo " usage: config.sh | --help | --version" - echo "" - echo " commands:" - echo " showusers" - echo " adduser [] []" - echo " deluser []" - echo " setpw []" - echo " setemail []" - echo "" - exit - -} - -function version() { - - echo "config.sh : version: $1" - exit -} - -function invalidoption () { - - echo "config.sh : invalid option -- $*" - echo "Try 'config.sh --help' for more information." - exit - -} - -checkforsqlite - -while [ "$#" -gt "0" ]; do - case $1 in - showusers) - $bin $dbfile "select * from players;" - exit - ;; - adduser) - shift - username="$1" - email="$4" - pw="$2" - serverid="$3" - playerid=$($bin $dbfile "select MAX(player_id)+1 as id from players WHERE player_id < 10000;") - - if [ "$serverid" == "" ]; then - serverid="1" - fi - - $bin $dbfile "insert into players (server_id, player_id, name, email, pw) values($serverid, $playerid, '$username', '$email', '$pw');" - exit - ;; - deluser) - shift - username="$1" - serverid="$2" - - if [ "$serverid" == "" ]; then - serverid="1" - fi - - $bin $dbfile "delete from players where name='$username';" - exit - ;; - setpw) - shift - username="$1" - newpw="$2" - serverid="$3" - - if [ "$serverid" == "" ]; then - serverid="1" - fi - - $bin $dbfile "update players set pw='$newpw' where name='$username';" - exit - ;; - setemail) - shift - username="$1" - newemail="$2" - serverid="$3" - - if [ "$serverid" == "" ]; then - serverid="1" - fi - - $bin $dbfile "update players set email='$newemail' where name='$username';" - exit - ;; - --help) - help - ;; - --version) - version $version - ;; - *) - invalidoption $* - break - ;; - esac -done - -invalidoption $* - -exit 0 diff --git a/murmur/murmur.conf.d b/murmur/murmur.conf.d deleted file mode 100644 index 592194b..0000000 --- a/murmur/murmur.conf.d +++ /dev/null @@ -1,2 +0,0 @@ -# Use /etc/murmur.ini as configuration file -PARAMS="-ini /etc/murmur.ini" diff --git a/murmur/murmur.dbus.conf b/murmur/murmur.dbus.conf deleted file mode 100644 index cf937d7..0000000 --- a/murmur/murmur.dbus.conf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/murmur/murmur.install b/murmur/murmur.install deleted file mode 100644 index 9e1446d..0000000 --- a/murmur/murmur.install +++ /dev/null @@ -1,33 +0,0 @@ -post_install() { - - # bug: dbus reload here doesn't work - # workaround: it seems to work if you do it a few seconds later, manually - /etc/rc.d/dbus reload > /dev/null - - /usr/bin/getent group murmur > /dev/null || /usr/sbin/groupadd murmur - /usr/bin/getent passwd murmur > /dev/null || \ - /usr/sbin/useradd -d /var/lib/murmur -g murmur -s /bin/false murmur - - chown -R murmur:murmur /var/lib/murmur - chown -R murmur:murmur /var/run/murmur - chown -R murmur:murmur /var/log/murmur - - echo - echo '==> Set the SuperUser password with (as root):' - echo '==> murmurd -ini /etc/murmur.ini -supw PASSWORD' -} - -post_upgrade() { - post_install -} - -pre_remove() { - [ -f /var/run/daemons/murmur ] && /etc/rc.d/murmur stop > /dev/null - killall -u murmur -5 - sleep 1 -} - -post_remove() { - /etc/rc.d/dbus reload > /dev/null - /usr/sbin/userdel murmur > /dev/null -} diff --git a/murmur/murmur.logrotate.d b/murmur/murmur.logrotate.d deleted file mode 100644 index e113175..0000000 --- a/murmur/murmur.logrotate.d +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/murmur/murmur.log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/murmur/murmur.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/murmur/murmur.rc.d b/murmur/murmur.rc.d deleted file mode 100755 index fac3fb3..0000000 --- a/murmur/murmur.rc.d +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -CONF=/etc/conf.d/murmur - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f $CONF ] && . $CONF - -PID=$(pidof -o %PPID /usr/sbin/murmurd) -case "$1" in - start) - stat_busy "Starting murmur" - [ -z "$PID" ] && /usr/sbin/murmurd -ini /etc/murmurd/murmurd.ini - [ -z "$PID" ] && /usr/sbin/murmurd -ini /etc/murmurd/murmurd-b52.ini - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon murmur - stat_done - fi - ;; - stop) - stat_busy "Stopping murmur" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon murmur - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/murmur/murmur.sh b/murmur/murmur.sh deleted file mode 100644 index 26aa922..0000000 --- a/murmur/murmur.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# -# Author: Otto Allmendinger -# Date: 2009-12-14 -# Description: Murmur wrapper script for pivilige separation -# - -ARGS="-ini /etc/murmur.ini $@" -su -c "/usr/lib/murmur/murmur ${ARGS}" - murmur diff --git a/murmur/murmurd b/murmur/murmurd deleted file mode 100644 index 630b49f..0000000 --- a/murmur/murmurd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/murmurd` - -case "$1" in - start) - stat_busy "Starting Murmur Server" - [ -z $PID ] && /usr/sbin/murmurd -ini /etc/murmurd.ini & > /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID /usr/sbin/murmurd` - echo $PID >/var/run/murmurd.pid - add_daemon murmurd - stat_done - fi - ;; - stop) - stat_busy "Stopping Murmur Server" - [ ! -z $PID ] && kill $PID & > /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon murmurd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -- cgit v1.2.3-24-g4f1b