fix torrc template and remove vim pkg on all hosts and add clearnet feature in replay script

1 files changed, 19 insertions, 5 deletions

diff --git a/replay b/replay
index 90b1ef3..85c31e6 100755
--- a/replay
+++ b/replay
@@ -6,6 +6,11 @@
 SOURCES=$HOME/park-admin/playbooks-ansible
 WORKDIR=/tmp
 COUNTLIMIT=10
+# Availables options are: 'clearnet' or 'tornetwork'
+NETWORK=clearnet
+FORK=8
+TIMEOUT=240
+FLAGS="--force-handlers -f $FORK -T $TIMEOUT"
 ###
 # Stop editing, it is ready
 ###
@@ -13,22 +18,31 @@ COUNTLIMIT=10
 REPLAY=true
 COUNT=1
 
-pushd $WORKDIR
+pushd $WORKDIR >/dev/null
+
+if [[ $NETWORK == "clearnet" ]]
+then
+    CMDLINE=ansible-playbook
+    HOSTFILE=$SOURCES/hosts.net
+elif [[ $NETWORK == "tornetwork" ]]
+then
+    CMDLINE="torsocks ansible-playbook"
+    HOSTFILE=$SOURCES/hosts.tor
+fi
 
 while [[ $REPLAY == "true" ]] && [[ $COUNT -lt $COUNTLIMIT ]]
 do
-    if ( torsocks ansible-playbook --force-handlers -i $SOURCES/hosts  $SOURCES/site.yml )
+    if ( $CMDLINE $FLAGS -i $HOSTFILE $SOURCES/site.yml )
     then
         REPLAY=false
     else
-        REPLAY=true
         # no infinite loop
         COUNT=$((COUNT + 1))
     fi
 done
 
-popd
+popd >/dev/null
 
 echo "End of Replay"
 echo "Replay launched $COUNT times"
-echo "Have a nice day!"
+echo "Have a nice day $USER !"