roles/blog: run updateBlog; now idempotent!

This commit is contained in:
CPunch 2023-01-17 17:41:25 -06:00
parent 4359544b6a
commit 41ef83bb4e
2 changed files with 8 additions and 10 deletions

View File

@ -4,18 +4,18 @@
repo: "https://github.com/CPunch/openpunk.git"
dest: "/var/www/{{ domain }}"
# TODO: make idempotent (call the updateBlog script !!)
- name: Build blog
command:
cmd: hugo
chdir: "/var/www/{{ domain }}"
- name: Install updateBlog script
template:
src: templates/updateBlog
dest: /usr/local/bin/updateBlog
mode: u+rx
- name: Build blog
command:
cmd: updateBlog
register: blog_out
changed_when: blog_out.stdout != "up to date"
# Rebuild blog every hour
- name: Setup blog cron job
cron:

View File

@ -15,16 +15,14 @@ LOCAL=$(git rev-parse @)
REMOTE=$(git rev-parse "$UPSTREAM")
BASE=$(git merge-base @ "$UPSTREAM")
if [ $LOCAL = $REMOTE ]; then
echo "blog is up to date!"
echo "up to date"
elif [ $LOCAL = $BASE ]; then
# there are changes to reset too
# && we need to update our blog
echo "missing changes!!"
git reset --hard origin/main
buildBlog
fi
if [ ! -d "$PUBLIC_DIR" ] || [ ! -d "$TOR_DIR" ]; then
elif [ ! -d "$PUBLIC_DIR" ] || [ ! -d "$TOR_DIR" ]; then
echo "missing directories..."
buildBlog
fi