Restructured project down to a single artifact. Fixed init.d script.

tomakehurst · Mar 2, 2014 · 4141fb8 · 4141fb8
1 parent 0b4dafb
commit 4141fb8
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,19 @@
+BUILDDIR = build
+VERSION = 0.5
+
+.PHONY: clean rpm deb test
+
+clean:
+	-rm -rf $(BUILDDIR)
+
+rpm:
+	-mkdir -p build
+	fpm -s dir -t rpm -d "python >= 2.6" -p build -n saboteur --license "Apache 2.0" --vendor "Tom Akehurst" -m "Tom Akehurst" --url "https://github.com/tomakehurst/saboteur" --description "A fault injection tool for resilience testing" -a noarch -v $(VERSION) --before-install before-install.sh --after-remove after-remove.sh saboteur.py=/usr/bin/saboteur-agent saboteur.sudo=/etc/sudoers.d/saboteur saboteur.init=/etc/init.d/saboteur-agent sab=/usr/bin/sab
+
+deb:
+	-mkdir -p build
+	fpm -s dir -t deb -d "python >= 2.6" -n saboteur --license "Apache 2.0" --vendor "Tom Akehurst" -m "Tom Akehurst" --url "https://github.com/tomakehurst/saboteur" --description "A fault injection tool for resilience testing" -a all -v $(VERSION) --before-install before-install.sh --after-remove after-remove.sh saboteur.py=/usr/bin/saboteur-agent saboteur.sudo=/etc/sudoers.d/saboteur saboteur.init=/etc/init.d/saboteur-agent sab=/usr/bin/sab
+	mv saboteur*.deb build
+
+test:
+	python saboteur-tests.py
diff --git a/agent/after-remove.sh → after-remove.sh b/agent/after-remove.sh → after-remove.sh
diff --git a/agent/Makefile b/agent/Makefile
diff --git a/agent/before-install.sh → before-install.sh b/agent/before-install.sh → before-install.sh
diff --git a/build/saboteur-0.5-1.noarch.rpm b/build/saboteur-0.5-1.noarch.rpm
diff --git a/build/saboteur_0.5_all.deb b/build/saboteur_0.5_all.deb
diff --git a/cli/Makefile b/cli/Makefile
diff --git a/cli/sab → sab b/cli/sab → sab
diff --git a/agent/saboteur-tests.py → saboteur-tests.py b/agent/saboteur-tests.py → saboteur-tests.py
diff --git a/agent/saboteur.init → saboteur.init b/agent/saboteur.init → saboteur.init
@@ -5,7 +5,7 @@ PIDFILE=/var/run/saboteur/agent.pid
 LOG=/var/log/saboteur/agent-error.log
 
 start_saboteur() {
-  nohup runuser - saboteur -s '/bin/sh' -c $DAEMON < /dev/null >> $LOG 2>&1 &
+  nohup su - saboteur -s '/bin/sh' -c $DAEMON < /dev/null >> $LOG 2>&1 &
   sleep 1
   PID=`ps -u saboteur | grep "python" | head -1 | awk '{print $1}'`
   if [ -z $PID ]; then

diff --git a/agent/saboteur.py → saboteur.py b/agent/saboteur.py → saboteur.py
diff --git a/agent/saboteur.sudo → saboteur.sudo b/agent/saboteur.sudo → saboteur.sudo