summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordian Edenhofer2015-12-13 15:32:49 +0100
committerGordian Edenhofer2015-12-13 15:32:49 +0100
commitd1423d7c0f805458ff19bba7a62e66726523b2b5 (patch)
treea24f448d847ac74b2533e2ef263e6717f1f52476
parent6ec8b00fb2a5385eb99bec4c9e8a30d9215ed62e (diff)
downloadaur-d1423d7c0f805458ff19bba7a62e66726523b2b5.tar.gz
Indentation: Use tabs everywhere
-rw-r--r--PKGBUILD6
-rw-r--r--arch_munge.init72
-rw-r--r--munge.install104
3 files changed, 91 insertions, 91 deletions
diff --git a/PKGBUILD b/PKGBUILD
index ff5748993f16..41ed6607e130 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,13 +10,13 @@ url="https://github.com/dun/munge/wiki"
license=('GPL3' 'LGPL3')
depends=('openssl')
optdepends=("zlib: zlib compression support"
- "bzip2: bzip2 compression support")
+ "bzip2: bzip2 compression support")
conflicts=('munge-git')
install=$pkgname.install
source=("https://github.com/dun/munge/archive/$pkgname-$pkgver.tar.gz"
- "arch_munge.init")
+ "arch_munge.init")
md5sums=('0b00f0a352f9619f205d41a31a2f3f80'
- '668942f323275199d35db5a534d9a80e')
+ '668942f323275199d35db5a534d9a80e')
build() {
cd "$srcdir/$pkgname-$pkgname-$pkgver"
diff --git a/arch_munge.init b/arch_munge.init
index 5252a2d600df..451483c8f97e 100644
--- a/arch_munge.init
+++ b/arch_munge.init
@@ -9,41 +9,41 @@ USER=munge
PID=`pidof -o %PPID /usr/bin/munged`
case "$1" in
- start)
- stat_busy "Starting MUNGE daemon"
- VARRUNDIR="/run/munge"
- if [ ! -d "$VARRUNDIR" ]; then
- mkdir -m 755 -p "$VARRUNDIR"
- [ -n "$USER" ] && chown "$USER" "$VARRUNDIR"
- fi
- [ -z "$PID" ] && su "$USER" -c /usr/bin/munged "$DAEMON_ARGS" 2>&1
- if [ $? -gt 0 ] ; then
- stat_fail
- else
- add_daemon $daemon_name # create the 'state' dir
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping MUNGE daemon"
- [ "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon $daemon_name # remove the 'state' dir
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 5
- $0 start
- ;;
- status)
- stat_busy "Checking MUNGE status"
- ck_status $daemon_name
- ;;
- *)
- echo "usage: $0 {start|stop|restart|status}"
+ start)
+ stat_busy "Starting MUNGE daemon"
+ VARRUNDIR="/run/munge"
+ if [ ! -d "$VARRUNDIR" ]; then
+ mkdir -m 755 -p "$VARRUNDIR"
+ [ -n "$USER" ] && chown "$USER" "$VARRUNDIR"
+ fi
+ [ -z "$PID" ] && su "$USER" -c /usr/bin/munged "$DAEMON_ARGS" 2>&1
+ if [ $? -gt 0 ] ; then
+ stat_fail
+ else
+ add_daemon $daemon_name # create the 'state' dir
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping MUNGE daemon"
+ [ "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon $daemon_name # remove the 'state' dir
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 5
+ $0 start
+ ;;
+ status)
+ stat_busy "Checking MUNGE status"
+ ck_status $daemon_name
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|status}"
esac
exit 0
diff --git a/munge.install b/munge.install
index 1672623128c2..5f93132bb80b 100644
--- a/munge.install
+++ b/munge.install
@@ -1,72 +1,72 @@
post_install() {
- # the installation process is described at https://code.google.com/p/munge/wiki/InstallationGuide
- # create munge /var/run/munge dir
- mkdir -p /var/run/munge
+ # the installation process is described at https://code.google.com/p/munge/wiki/InstallationGuide
+ # create munge /var/run/munge dir
+ mkdir -p /var/run/munge
- # add munge user/group
- echo -e "\e[34;1m==>\e[39;1m Adding munge system group... \e[0m"
- groupadd -r munge
+ # add munge user/group
+ echo -e "\e[34;1m==>\e[39;1m Adding munge system group... \e[0m"
+ groupadd -r munge
- echo -e "\e[34;1m==>\e[39;1m Adding munge system user... \e[0m"
- useradd -r -c "Munge Daemon" -d /var/log/munge -g munge munge
+ echo -e "\e[34;1m==>\e[39;1m Adding munge system user... \e[0m"
+ useradd -r -c "Munge Daemon" -d /var/log/munge -g munge munge
- echo -e "\e[34;1m==>\e[39;1m Locking Munge User Account... \e[0m"
- passwd -l munge &>/dev/null
+ echo -e "\e[34;1m==>\e[39;1m Locking Munge User Account... \e[0m"
+ passwd -l munge &>/dev/null
- # create munge key
- if [ ! -e /etc/munge/munge.key ] && [ -c /dev/urandom ]; then
- echo -e "\e[34;1m==>\e[39;1m Creating random munge key : /etc/munge/munge.key\e[0m"
- dd if=/dev/urandom bs=1 count=1024 of=/etc/munge/munge.key
- chmod 0400 /etc/munge/munge.key
- else
- if [ -c /dev/urandom ]; then
- echo -e "\e[34;1m==>\e[39;1m INFO: no munge key is generated since /etc/munge/munge.key already exists \e[0m"
- else
- echo -e "\e[34;1m==>\e[39;1m WARNING: did not create /etc/munge/munge.key since /dev/urandom is not found \e[0m"
- fi
- fi
+ # create munge key
+ if [ ! -e /etc/munge/munge.key ] && [ -c /dev/urandom ]; then
+ echo -e "\e[34;1m==>\e[39;1m Creating random munge key : /etc/munge/munge.key\e[0m"
+ dd if=/dev/urandom bs=1 count=1024 of=/etc/munge/munge.key
+ chmod 0400 /etc/munge/munge.key
+ else
+ if [ -c /dev/urandom ]; then
+ echo -e "\e[34;1m==>\e[39;1m INFO: no munge key is generated since /etc/munge/munge.key already exists \e[0m"
+ else
+ echo -e "\e[34;1m==>\e[39;1m WARNING: did not create /etc/munge/munge.key since /dev/urandom is not found \e[0m"
+ fi
+ fi
- # set permissions
- chown munge:munge -R /etc/munge
- chown munge:munge -R /var/log/munge
- chown munge:munge -R /var/lib/munge
- chown munge:munge -R /var/run/munge
+ # set permissions
+ chown munge:munge -R /etc/munge
+ chown munge:munge -R /var/log/munge
+ chown munge:munge -R /var/lib/munge
+ chown munge:munge -R /var/run/munge
- # securing the installation, this is optional!
- #chmod 0700 /etc/munge
- #chmod 0711 /var/lib/munge
- #chmod 0700 /var/log/munge
- #chmod 0755 /var/run/munge
+ # securing the installation, this is optional!
+ #chmod 0700 /etc/munge
+ #chmod 0711 /var/lib/munge
+ #chmod 0700 /var/log/munge
+ #chmod 0755 /var/run/munge
}
post_upgrade() {
- # set permissions
- chown munge:munge -R /etc/munge
- chown munge:munge -R /var/log/munge
- chown munge:munge -R /var/lib/munge
- chown munge:munge -R /var/run/munge
- if [ -e /etc/munge/munge.key ]; then
- chmod 0400 /etc/munge/munge.key
- fi
+ # set permissions
+ chown munge:munge -R /etc/munge
+ chown munge:munge -R /var/log/munge
+ chown munge:munge -R /var/lib/munge
+ chown munge:munge -R /var/run/munge
+ if [ -e /etc/munge/munge.key ]; then
+ chmod 0400 /etc/munge/munge.key
+ fi
}
pre_remove() {
- which systemctl >& /dev/null
- if [ $? -eq 0 ]; then
- echo -e "\e[34;1m==>\e[39;1m Stopping munge using SystemD... \e[0m"
- systemctl stop munge
+ which systemctl >& /dev/null
+ if [ $? -eq 0 ]; then
+ echo -e "\e[34;1m==>\e[39;1m Stopping munge using SystemD... \e[0m"
+ systemctl stop munge
- echo -e "\e[34;1m==>\e[39;1m Disabling SystemD related file(s)... \e[0m"
- systemctl disable munge.service
- else
- echo -e "\e[34;1m==>\e[39;1m Stopping munge... "
- /etc/rc.d/munge stop
- fi
+ echo -e "\e[34;1m==>\e[39;1m Disabling SystemD related file(s)... \e[0m"
+ systemctl disable munge.service
+ else
+ echo -e "\e[34;1m==>\e[39;1m Stopping munge... "
+ /etc/rc.d/munge stop
+ fi
}
post_remove() {
- # Removing obsolete dir
- rm -rf /var/run/munge
+ # Removing obsolete dir
+ rm -rf /var/run/munge
# Notifying the user of kept dirs and change owner
[ -d /etc/munge ] && chown root:root -R /etc/munge && echo -e "\e[34;1m==>\e[39;1m NOTE: Custom configuration-file(s) in /etc/munge/ were kept on your system.\e[0m"