diff --git a/bin/redo b/bin/redo new file mode 100755 index 0000000..b5f3264 --- /dev/null +++ b/bin/redo @@ -0,0 +1,5 @@ +#!/bin/sh + +/etc/init.d/apache2 restart +/etc/init.d/varnish restart +/etc/init.d/nginx restart diff --git a/bin/stack_restart b/bin/stack_restart new file mode 100755 index 0000000..a15b4c3 --- /dev/null +++ b/bin/stack_restart @@ -0,0 +1,10 @@ +#!/bin/bash +if [[ $EUID -ne 0 ]]; then + echo "You must be a root user" 2>&1 + exit 1 +else + service nginx configtest && service nginx restart + service php5-fpm restart + # no varnish configtest! be careful + service varnish restart +fi diff --git a/bin/update_sites b/bin/update_sites index f8d0f4a..e6a0631 100755 --- a/bin/update_sites +++ b/bin/update_sites @@ -5,6 +5,6 @@ DIR=/sites for i in `ls /sites/`; do # we don't care about STDOUT, but let STDERR escape (which will generate email if used in cron) - cd $DIR/$i/htdocs && git fetch --all --prune > /dev/null && git rebase origin/master > /dev/null + cd $DIR/$i/htdocs && git fetch --all > /dev/null && git checkout origin/master > /dev/null done