From a025ef442523e8de5af9e173733bc95055c10999 Mon Sep 17 00:00:00 2001 From: arne Date: Sat, 18 May 2024 13:20:28 +0200 Subject: [PATCH] fix --- files/etc/webhooks.json | 7 +++++++ files/openrc/hugo | 2 +- files/openrc/webhook | 2 +- files/sbin/genHugo | 5 +++++ tasks/main.yml | 12 ++++++++++++ 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 files/etc/webhooks.json create mode 100644 files/sbin/genHugo diff --git a/files/etc/webhooks.json b/files/etc/webhooks.json new file mode 100644 index 0000000..88711bc --- /dev/null +++ b/files/etc/webhooks.json @@ -0,0 +1,7 @@ +[ + { + "id": "generate", + "execute-command": "/sbin/genHugo", + "command-working-directory": "/srv/hugo" + } +] diff --git a/files/openrc/hugo b/files/openrc/hugo index df58dd1..89123a8 100644 --- a/files/openrc/hugo +++ b/files/openrc/hugo @@ -1,3 +1,3 @@ #!/sbin/openrc-run -command=/srv/hugo/generate.sh +command=/sbin/genHugo diff --git a/files/openrc/webhook b/files/openrc/webhook index 9f1377c..fc754df 100644 --- a/files/openrc/webhook +++ b/files/openrc/webhook @@ -2,5 +2,5 @@ pidfile="/run/$RC_SVCNAME.pid" command="/usr/bin/webhook" -command_args="-hooks /srv/hugo/hooks.json -verbose" +command_args="-hooks /etc/webhooks.json -verbose" command_background="yes" diff --git a/files/sbin/genHugo b/files/sbin/genHugo new file mode 100644 index 0000000..f82dfbe --- /dev/null +++ b/files/sbin/genHugo @@ -0,0 +1,5 @@ +#!/bin/sh + +cd /srv/hugo +git pull +HUGO_ENV="production" hugo diff --git a/tasks/main.yml b/tasks/main.yml index 96cdaf6..3c25b04 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -8,6 +8,18 @@ dest: /srv/hugo version: master +- name: install genHugo + copy: + src: sbin/genHugo + dest: /sbin/genHugo + mode: 0755 + +- name: deploy webhook config + copy: + src: etc/webhooks.json + dest: /etc/webhooks.json + mode: 0644 + - name: deploy init scripts copy: src: "openrc/{{ item }}"