summaryrefslogtreecommitdiffstats
path: root/conf/redhat
diff options
context:
space:
mode:
authorIan Taylor <ian@lorf.org>2009-06-05 12:38:35 -0400
committerJames Turnbull <james@lovedthanlost.net>2009-06-06 09:11:28 +1000
commit41ce18cc8ea239d1633fc6cd9e9f599957a82e74 (patch)
tree9d398b4e3e6d726a174b5b57094c7dd6749ccf0e /conf/redhat
parentf3b40923605420f774dac298fb1708de180c0a81 (diff)
downloadpuppet-41ce18cc8ea239d1633fc6cd9e9f599957a82e74.tar.gz
puppet-41ce18cc8ea239d1633fc6cd9e9f599957a82e74.tar.xz
puppet-41ce18cc8ea239d1633fc6cd9e9f599957a82e74.zip
Changed tabs to spaces without interfering with indentation or alignment
Diffstat (limited to 'conf/redhat')
-rw-r--r--conf/redhat/client.init78
-rw-r--r--conf/redhat/server.init74
2 files changed, 76 insertions, 76 deletions
diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index 44caab140..114fb1821 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -33,28 +33,28 @@ PUPPET_OPTS=""
##[ -n "$INIT_VERSION" ] && PUPPET_OPTS="${PUPPET_OPTS} --fullrun"
start() {
- echo -n $"Starting puppet: "
- daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
- RETVAL=$?
- echo
+ echo -n $"Starting puppet: "
+ daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
+ RETVAL=$?
+ echo
[ $RETVAL = 0 ] && touch ${lockfile}
return $RETVAL
}
stop() {
- echo -n $"Stopping puppet: "
- killproc $puppetd
- RETVAL=$?
- echo
- [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+ echo -n $"Stopping puppet: "
+ killproc $puppetd
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
}
reload() {
- echo -n $"Restarting puppet: "
- killproc $puppetd -HUP
- RETVAL=$?
- echo
- return $RETVAL
+ echo -n $"Restarting puppet: "
+ killproc $puppetd -HUP
+ RETVAL=$?
+ echo
+ return $RETVAL
}
restart() {
@@ -63,40 +63,40 @@ restart() {
}
genconfig() {
- echo -n $"Generate configuration puppet: "
- $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
+ echo -n $"Generate configuration puppet: "
+ $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
}
case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- restart
- ;;
- reload|force-reload)
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ restart
+ ;;
+ reload|force-reload)
reload
- ;;
- condrestart|try-restart)
- [ -f "$pidfile" ] && restart
- ;;
- status)
+ ;;
+ condrestart|try-restart)
+ [ -f "$pidfile" ] && restart
+ ;;
+ status)
status -p "$pidfile" $puppetd
RETVAL=$?
- ;;
- once)
+ ;;
+ once)
shift
$puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
;;
- genconfig)
- genconfig
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
- exit 1
+ genconfig)
+ genconfig
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
+ exit 1
esac
exit $RETVAL
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 6871b9a92..48c8e4ed5 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -18,7 +18,7 @@ lockfile=/var/lock/subsys/puppetmaster
. /etc/rc.d/init.d/functions
if [ -f /etc/sysconfig/puppetmaster ]; then
- . /etc/sysconfig/puppetmaster
+ . /etc/sysconfig/puppetmaster
fi
PUPPETMASTER_OPTS=""
@@ -30,7 +30,7 @@ elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
fi
[ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest=${PUPPETMASTER_LOG}"
PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
- ${PUPPETMASTER_EXTRA_OPTS}"
+ ${PUPPETMASTER_EXTRA_OPTS}"
RETVAL=0
@@ -38,10 +38,10 @@ prog=puppetmasterd
PUPPETMASTER=/usr/sbin/$prog
start() {
- echo -n $"Starting puppetmaster: "
+ echo -n $"Starting puppetmaster: "
- # Confirm the manifest exists
- if [ -r $PUPPETMASTER_MANIFEST ]; then
+ # Confirm the manifest exists
+ if [ -r $PUPPETMASTER_MANIFEST ]; then
if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
@@ -52,18 +52,18 @@ start() {
daemon $PUPPETMASTER $PUPPETMASTER_OPTS
RETVAL=$?
fi
- else
- failure $"Manifest does not exist: $PUPPETMASTER_MANIFEST"
- echo
- return 1
- fi
- [ $RETVAL -eq 0 ] && touch "$lockfile"
- echo
- return $RETVAL
+ else
+ failure $"Manifest does not exist: $PUPPETMASTER_MANIFEST"
+ echo
+ return 1
+ fi
+ [ $RETVAL -eq 0 ] && touch "$lockfile"
+ echo
+ return $RETVAL
}
stop() {
- echo -n $"Stopping puppetmaster: "
+ echo -n $"Stopping puppetmaster: "
if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
@@ -74,9 +74,9 @@ stop() {
killproc $PUPPETMASTER
RETVAL=$?
fi
- echo
- [ $RETVAL -eq 0 ] && rm -f "$lockfile"
- return $RETVAL
+ echo
+ [ $RETVAL -eq 0 ] && rm -f "$lockfile"
+ return $RETVAL
}
restart() {
@@ -97,7 +97,7 @@ puppetmaster_status() {
ret=$?; [ $ret != 0 ] && RETVAL=$ret
done
else
- status $PUPPETMASTER
+ status $PUPPETMASTER
RETVAL=$?
fi
return $RETVAL
@@ -105,26 +105,26 @@ puppetmaster_status() {
case "$1" in
start)
- start
- ;;
- stop)
- stop
- ;;
- restart|reload|force-reload)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload|force-reload)
restart
- ;;
- condrestart)
- [ -f "$lockfile" ] && restart
- ;;
- status)
- puppetmaster_status
- ;;
- genconfig)
- genconfig
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}"
- exit 1
+ ;;
+ condrestart)
+ [ -f "$lockfile" ] && restart
+ ;;
+ status)
+ puppetmaster_status
+ ;;
+ genconfig)
+ genconfig
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}"
+ exit 1
esac
exit $RETVAL