From e0cfde4c9f2f063d281adeb35d341d4ada11606a Mon Sep 17 00:00:00 2001 From: Tunui Franken Date: Sun, 7 Apr 2024 12:09:50 +0200 Subject: [PATCH] Permit to define forgejo_dump_path with `ansible-playbook -e ...` --- playbook_lime2.yml | 1 + roles/forgejo/tasks/repos.yml | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/playbook_lime2.yml b/playbook_lime2.yml index 2a3a0b3..c579928 100644 --- a/playbook_lime2.yml +++ b/playbook_lime2.yml @@ -1,4 +1,5 @@ --- +# Usage: ansible-playbook playbook_lime2.yml [ansible-opts] [-e forgejo_dump_path=/path/to/forgejo/dump] - name: Install services for lime2 home server gather_facts: true diff --git a/roles/forgejo/tasks/repos.yml b/roles/forgejo/tasks/repos.yml index e60fec7..5d9d57a 100644 --- a/roles/forgejo/tasks/repos.yml +++ b/roles/forgejo/tasks/repos.yml @@ -1,19 +1,30 @@ --- - name: Ask to push latest forgejo_dump zipfile + when: forgejo_dump_path is not defined ansible.builtin.pause: prompt: "Local path to forgejo dump, so we can push it [leave empty to not push]" echo: true - register: user_forgejo_dump_path + register: forgejo_dump_path -- name: Push latest forgejo dump zipfile +- name: Push latest forgejo dump zipfile (no user input) become: true ansible.builtin.copy: - src: "{{ user_forgejo_dump_path.user_input }}" - dest: "{{ forgejo_run_dir }}/forgejo-dumps/{{ user_forgejo_dump_path.user_input | basename }}" + src: "{{ forgejo_dump_path }}" + dest: "{{ forgejo_run_dir }}/forgejo-dumps/{{ forgejo_dump_path | basename }}" owner: git group: git mode: 0640 - when: user_forgejo_dump_path.user_input != '' + when: forgejo_dump_path.user_input is not defined + +- name: Push latest forgejo dump zipfile (user input) + become: true + ansible.builtin.copy: + src: "{{ forgejo_dump_path.user_input }}" + dest: "{{ forgejo_run_dir }}/forgejo-dumps/{{ forgejo_dump_path.user_input | basename }}" + owner: git + group: git + mode: 0640 + when: forgejo_dump_path.user_input is defined and forgejo_dump_path.user_input != '' - name: Find all forgejo dumps on the server become: true