diff options
| author | Sacha Chua <sacha@sachachua.com> | 2022-10-14 20:36:07 -0400 |
|---|---|---|
| committer | Sacha Chua <sacha@sachachua.com> | 2022-10-14 20:36:07 -0400 |
| commit | 2d391af591700ae52b4f2630454eb31dcbbdd3ad (patch) | |
| tree | 04bcbef2757cce9fd932e5c80d6347a7f91af56c | |
| parent | e618dfe5588d2c9c5d7fb954f81001f5f84d6e1f (diff) | |
| download | emacsconf-ansible-2d391af591700ae52b4f2630454eb31dcbbdd3ad.tar.xz emacsconf-ansible-2d391af591700ae52b4f2630454eb31dcbbdd3ad.zip | |
Make publishing work again
| -rw-r--r-- | README.org | 21 | ||||
| -rw-r--r-- | pad/tasks/main.yml | 4 | ||||
| -rw-r--r-- | wiki-edit/tasks/main.yaml | 4 |
3 files changed, 21 insertions, 8 deletions
@@ -6,14 +6,25 @@ ansible-galaxy collection install community.general Production: needs prod-vars.yml, see prod-vars.yml.sample Docker: needs docker-vars.yml, see docker-vars.yml.sample -* Front - publishing -** Prod +* Wiki +** Ikiwiki +*** Docker +Creating: +ansible-playbook -i docker-inventory.yml docker-playbook.yml --tags wiki + +Hmm... How do I want to do this? I have a 2022-pages in my local repo, not pushed to the git. So Docker needs to mount it. +** Publishing +*** Prod To run the playbook and publish the main schedule: -ansible-playbook -i inventory.yml prod-playbook.yml +ansible-playbook -i inventory.yml prod-playbook.yml --tags publish Update a specific talk's before/nav and the main schedule: (ex: wayland) -ansible-playbook playbook.yml -e '{"slug": "wayland"}' -i inventory.yml -** Docker +ansible-playbook playbook.yml -e '{"slug": "wayland"}' -i inventory.yml --tags publish + +Force-publish the schedule: +ansible-playbook -i inventory.yml prod-playbook.yml --tags publish -e force_publish=true + +*** Docker Creating: - ansible-playbook -i docker-inventory.yml docker-playbook.yml diff --git a/pad/tasks/main.yml b/pad/tasks/main.yml index 4e2d5cc..42ed834 100644 --- a/pad/tasks/main.yml +++ b/pad/tasks/main.yml @@ -75,7 +75,7 @@ owner: root group: root mode: 0644 - when: use_initd is defined + when: use_initd - name: Install systemd configuration tags: system become: true @@ -85,7 +85,7 @@ owner: root group: root mode: 0755 - when: use_initd is not defined + when: not use_initd - name: Restart Etherpad become: true service: diff --git a/wiki-edit/tasks/main.yaml b/wiki-edit/tasks/main.yaml index 570c953..11ca05b 100644 --- a/wiki-edit/tasks/main.yaml +++ b/wiki-edit/tasks/main.yaml @@ -14,6 +14,7 @@ name: emacs-snapshot-nox state: present - name: Set up or update repositories + tags: publish block: - name: Check out wiki repository ansible.builtin.git: @@ -23,6 +24,7 @@ ansible.builtin.git: repo: git@git.emacsconf.org:pub/emacsconf-el dest: ~/emacsconf-el + register: elisp - name: Check out emacsconf-2022-private ansible.builtin.git: repo: git@git.emacsconf.org:emacsconf-2022-private @@ -33,7 +35,7 @@ block: - name: Publish the schedule command: emacs -l ~/.emacs.d/init.el --batch --exec '(emacsconf-generate-main-schedule)' - when: private.changed and slug is not defined + when: force_publish or ((private.changed or elisp.changed) and slug is not defined) - name: Update a specific talk's nav page tags: publish-talk command: emacs -l ~/.emacs.d/init.el --batch --exec '(emacsconf-with-talk-heading "{{ slug }}" (emacsconf-update-talk))' |