From 7c9dd9ee9653c854badaf4f1d21d7dd833e3e620 Mon Sep 17 00:00:00 2001
From: irregulator <irregulator@riseup.net>
Date: Thu, 22 May 2014 20:44:51 +0300
Subject: Move obfsproxy_daemon to obfsproxy_init

---
 puppet/modules/obfsproxy/files/obfsproxy_daemon | 100 ------------------------
 puppet/modules/obfsproxy/files/obfsproxy_init   | 100 ++++++++++++++++++++++++
 puppet/modules/obfsproxy/manifests/init.pp      |   2 +-
 3 files changed, 101 insertions(+), 101 deletions(-)
 delete mode 100755 puppet/modules/obfsproxy/files/obfsproxy_daemon
 create mode 100755 puppet/modules/obfsproxy/files/obfsproxy_init

(limited to 'puppet')

diff --git a/puppet/modules/obfsproxy/files/obfsproxy_daemon b/puppet/modules/obfsproxy/files/obfsproxy_daemon
deleted file mode 100755
index 4c9bcedc..00000000
--- a/puppet/modules/obfsproxy/files/obfsproxy_daemon
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          obfsproxy daemon
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: obfsproxy daemon
-# Description:       obfsproxy daemon
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-DAEMON=/usr/bin/obfsproxy
-NAME=obfsproxy
-DESC="obfsproxy daemon"
-USER=obfsproxy
-DATDIR=/etc/obfsproxy
-PIDFILE=/var/run/obfsproxy.pid
-CONF=$DATDIR/obfsproxy.conf
-
-# If the daemon is not there, then exit.
-test -x $DAEMON || exit 0
-
-if [ -f $CONF ] ; then
-  . $CONF
-else
-  echo "Obfsproxy configuration file is missing, aborting..."
-  exit
-fi
-
-DAEMONARGS=" --log-min-severity=$LOG --data-dir=$DATDIR $TRANSPORT \
-        $PARAM --dest=$DEST_IP:$DEST_PORT server 0.0.0.0:$PORT"
-
-start_obfsproxy() {
-  start-stop-daemon --start --quiet --oknodo -m --pidfile $PIDFILE \
-		-b -c $USER --startas $DAEMON --$DAEMONARGS
-}
-
-stop_obfsproxy() {
-  start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
-}
-
-status_obfsproxy() {
-  status_of_proc -p $PIDFILE $DAEMON $NAME && status="0" || status="$?"
-}
-
-case $1 in
- start)
-  if [ -e $PIDFILE ]; then
-   status_obfsproxy
-   if [ $status = "0" ]; then
-    exit
-   fi
-  fi
-  log_begin_msg "Starting $DESC"
-  start_obfsproxy
-  log_end_msg $?
-  ;;
- stop)
-  if [ -e $PIDFILE ]; then
-   status_obfsproxy
-   if [ $status = "0" ]; then
-     log_begin_msg "Stopping $DESC"
-     stop_obfsproxy
-     rm -f $PIDFILE
-     log_end_msg $?
-   fi
-  else
-     log_daemon_msg "$NAME is not running"
-     log_end_msg $?
-  fi
-  ;;
- restart)
-  $0 stop && sleep 2 && $0 start
-  ;;
- status)
-#  if [ -e $PIDFILE ]; then
-#   #status_of_proc -p $PIDFILE $DAEMON "$NAME " && exit 0 || exit $?
-#   status_obfsproxy
-#  else
-#   log_daemon_msg "$NAME is not running"
-#   log_end_msg 0
-#  fi
-  status_obfsproxy
-  ;;
- reload)
-  if [ -e $PIDFILE ]; then
-   start-stop-daemon --stop --signal USR1 --quiet --pidfile $PIDFILE --name $NAME
-   log_success_msg "$DESC reloaded successfully"
-  else
-   log_failure_msg "$PIDFILE does not exists"
-  fi
-  ;;
- *)
-  echo "Usage: $0 {start|stop|restart|reload|status}"
-  exit 2
-  ;;
-esac
diff --git a/puppet/modules/obfsproxy/files/obfsproxy_init b/puppet/modules/obfsproxy/files/obfsproxy_init
new file mode 100755
index 00000000..4c9bcedc
--- /dev/null
+++ b/puppet/modules/obfsproxy/files/obfsproxy_init
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          obfsproxy daemon
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: obfsproxy daemon
+# Description:       obfsproxy daemon
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+DAEMON=/usr/bin/obfsproxy
+NAME=obfsproxy
+DESC="obfsproxy daemon"
+USER=obfsproxy
+DATDIR=/etc/obfsproxy
+PIDFILE=/var/run/obfsproxy.pid
+CONF=$DATDIR/obfsproxy.conf
+
+# If the daemon is not there, then exit.
+test -x $DAEMON || exit 0
+
+if [ -f $CONF ] ; then
+  . $CONF
+else
+  echo "Obfsproxy configuration file is missing, aborting..."
+  exit
+fi
+
+DAEMONARGS=" --log-min-severity=$LOG --data-dir=$DATDIR $TRANSPORT \
+        $PARAM --dest=$DEST_IP:$DEST_PORT server 0.0.0.0:$PORT"
+
+start_obfsproxy() {
+  start-stop-daemon --start --quiet --oknodo -m --pidfile $PIDFILE \
+		-b -c $USER --startas $DAEMON --$DAEMONARGS
+}
+
+stop_obfsproxy() {
+  start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+}
+
+status_obfsproxy() {
+  status_of_proc -p $PIDFILE $DAEMON $NAME && status="0" || status="$?"
+}
+
+case $1 in
+ start)
+  if [ -e $PIDFILE ]; then
+   status_obfsproxy
+   if [ $status = "0" ]; then
+    exit
+   fi
+  fi
+  log_begin_msg "Starting $DESC"
+  start_obfsproxy
+  log_end_msg $?
+  ;;
+ stop)
+  if [ -e $PIDFILE ]; then
+   status_obfsproxy
+   if [ $status = "0" ]; then
+     log_begin_msg "Stopping $DESC"
+     stop_obfsproxy
+     rm -f $PIDFILE
+     log_end_msg $?
+   fi
+  else
+     log_daemon_msg "$NAME is not running"
+     log_end_msg $?
+  fi
+  ;;
+ restart)
+  $0 stop && sleep 2 && $0 start
+  ;;
+ status)
+#  if [ -e $PIDFILE ]; then
+#   #status_of_proc -p $PIDFILE $DAEMON "$NAME " && exit 0 || exit $?
+#   status_obfsproxy
+#  else
+#   log_daemon_msg "$NAME is not running"
+#   log_end_msg 0
+#  fi
+  status_obfsproxy
+  ;;
+ reload)
+  if [ -e $PIDFILE ]; then
+   start-stop-daemon --stop --signal USR1 --quiet --pidfile $PIDFILE --name $NAME
+   log_success_msg "$DESC reloaded successfully"
+  else
+   log_failure_msg "$PIDFILE does not exists"
+  fi
+  ;;
+ *)
+  echo "Usage: $0 {start|stop|restart|reload|status}"
+  exit 2
+  ;;
+esac
diff --git a/puppet/modules/obfsproxy/manifests/init.pp b/puppet/modules/obfsproxy/manifests/init.pp
index c15a0dc8..e62bfcd8 100644
--- a/puppet/modules/obfsproxy/manifests/init.pp
+++ b/puppet/modules/obfsproxy/manifests/init.pp
@@ -31,7 +31,7 @@ class obfsproxy (
   file { '/etc/init.d/obfsproxy':
     path      => '/etc/init.d/obfsproxy',
     ensure    => present,
-    source    => 'puppet:///modules/obfsproxy/obfsproxy_daemon',
+    source    => 'puppet:///modules/obfsproxy/obfsproxy_init',
     owner     => 'root',
     group     => 'root',
     mode      => '0750',
-- 
cgit v1.2.3