From 1b6e760dc0334222f52159799667060d4345c164 Mon Sep 17 00:00:00 2001 From: Lisa Marie Maginnis Date: Tue, 5 Jul 2016 11:53:10 -0400 Subject: [PATCH] updated ryf hook --- ryf.git/post-update | 2 +- ryf.git/post-update.ryf.fsf.org | 41 ++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/ryf.git/post-update b/ryf.git/post-update index d79cd8c..06f8b8f 100755 --- a/ryf.git/post-update +++ b/ryf.git/post-update @@ -3,4 +3,4 @@ # An example hook script that is called after a successful # push is made. # -exec post-update.ryf.fsf.org +exec ./post-update.ryf.fsf.org diff --git a/ryf.git/post-update.ryf.fsf.org b/ryf.git/post-update.ryf.fsf.org index 9cdcaf4..344964d 100755 --- a/ryf.git/post-update.ryf.fsf.org +++ b/ryf.git/post-update.ryf.fsf.org @@ -5,6 +5,45 @@ # echo "------- post-update started -------" -ssh www-data@ryf.fsf.org "cd /var/www/git;git pull" +# Disabling this, we're moving to rsync because it works better. +#ssh www-data@ryf.fsf.org "cd /var/www/git;git pull" +unset GIT_DIR +SELF=ryf.git +REPO_DIR=$HOME/repositories +CHECKOUT_DIR=$HOME/local/checkouts/$SELF +TARGET_DIR=/var/www/ryf.fsf.org +TARGET_HOST=ryf.fsf.org + + +case $1 in + refs/heads/live) + branch=live + ;; + refs/heads/dev) + branch=dev + ;; +*) + echo "No action for this branch!" + ;; +esac + + +echo "Updating local checkout..." +if [ ! -d $CHECKOUT_DIR ]; then + git clone $REPO_DIR/$SELF $CHECKOUT_DIR + cd $CHECKOUT_DIR + git checkout $branch +else + cd $CHECKOUT_DIR + git checkout $branch + git pull origin $branch +fi + +if [ -n $TARGET_HOST ]; then + echo Deploying to: $branch + rsync -avrSPX --delete-after $CHECKOUT_DIR/* root@$TARGET_HOST:$TARGET_DIR/ +fi + +exec git update-server-info echo "------- post-update finished ------" -- 2.25.1