From 8e5e91bbcef35157d1ae3c8d255e85800d7ab14e Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Tue, 11 Oct 2022 22:01:06 -0400 Subject: [PATCH] Introduce a blank template for roles. --- ansible/roles/blank/defaults/main.yaml | 1 + ansible/roles/blank/files/foo | 0 ansible/roles/blank/handlers/main.yaml | 4 ++++ ansible/roles/blank/meta/main.yaml | 2 ++ ansible/roles/blank/tasks/common.yaml | 14 ++++++++++++++ ansible/roles/blank/tasks/freebsd.yaml | 0 ansible/roles/blank/tasks/linux.yaml | 0 ansible/roles/blank/tasks/main.yaml | 2 ++ ansible/roles/blank/tasks/peruser.yaml | 8 ++++++++ ansible/roles/blank/tasks/peruser_freebsd.yaml | 0 ansible/roles/blank/tasks/peruser_linux.yaml | 0 ansible/roles/blank/templates/foo.yaml.j2 | 0 ansible/roles/zsh/handlers/main.yaml | 4 ---- ansible/roles/zsh/tasks/main.yaml | 9 +++++++++ 14 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 ansible/roles/blank/defaults/main.yaml create mode 100644 ansible/roles/blank/files/foo create mode 100644 ansible/roles/blank/handlers/main.yaml create mode 100644 ansible/roles/blank/meta/main.yaml create mode 100644 ansible/roles/blank/tasks/common.yaml create mode 100644 ansible/roles/blank/tasks/freebsd.yaml create mode 100644 ansible/roles/blank/tasks/linux.yaml create mode 100644 ansible/roles/blank/tasks/main.yaml create mode 100644 ansible/roles/blank/tasks/peruser.yaml create mode 100644 ansible/roles/blank/tasks/peruser_freebsd.yaml create mode 100644 ansible/roles/blank/tasks/peruser_linux.yaml create mode 100644 ansible/roles/blank/templates/foo.yaml.j2 delete mode 100644 ansible/roles/zsh/handlers/main.yaml diff --git a/ansible/roles/blank/defaults/main.yaml b/ansible/roles/blank/defaults/main.yaml new file mode 100644 index 0000000..0712e11 --- /dev/null +++ b/ansible/roles/blank/defaults/main.yaml @@ -0,0 +1 @@ +# foo: [] diff --git a/ansible/roles/blank/files/foo b/ansible/roles/blank/files/foo new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/blank/handlers/main.yaml b/ansible/roles/blank/handlers/main.yaml new file mode 100644 index 0000000..729fb8f --- /dev/null +++ b/ansible/roles/blank/handlers/main.yaml @@ -0,0 +1,4 @@ +# - name: restart foo +# service: +# name: foo +# state: restarted diff --git a/ansible/roles/blank/meta/main.yaml b/ansible/roles/blank/meta/main.yaml new file mode 100644 index 0000000..43e965e --- /dev/null +++ b/ansible/roles/blank/meta/main.yaml @@ -0,0 +1,2 @@ +# dependencies: +# - users diff --git a/ansible/roles/blank/tasks/common.yaml b/ansible/roles/blank/tasks/common.yaml new file mode 100644 index 0000000..d7c1735 --- /dev/null +++ b/ansible/roles/blank/tasks/common.yaml @@ -0,0 +1,14 @@ +- import_tasks: tasks/freebsd.yaml + when: 'os_flavor == "freebsd"' + +- import_tasks: tasks/linux.yaml + when: 'os_flavor == "linux"' + +- include_tasks: + file: tasks/peruser.yaml + apply: + become: yes + become_user: "{{ initialize_user }}" + loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}" + loop_control: + loop_var: initialize_user diff --git a/ansible/roles/blank/tasks/freebsd.yaml b/ansible/roles/blank/tasks/freebsd.yaml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/blank/tasks/linux.yaml b/ansible/roles/blank/tasks/linux.yaml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/blank/tasks/main.yaml b/ansible/roles/blank/tasks/main.yaml new file mode 100644 index 0000000..c7a170c --- /dev/null +++ b/ansible/roles/blank/tasks/main.yaml @@ -0,0 +1,2 @@ +- import_tasks: tasks/common.yaml + when: foo is defined diff --git a/ansible/roles/blank/tasks/peruser.yaml b/ansible/roles/blank/tasks/peruser.yaml new file mode 100644 index 0000000..cbd53eb --- /dev/null +++ b/ansible/roles/blank/tasks/peruser.yaml @@ -0,0 +1,8 @@ +- include_role: + name: per_user + +- import_tasks: tasks/peruser_freebsd.yaml + when: 'os_flavor == "freebsd"' + +- import_tasks: tasks/peruser_linux.yaml + when: 'os_flavor == "linux" diff --git a/ansible/roles/blank/tasks/peruser_freebsd.yaml b/ansible/roles/blank/tasks/peruser_freebsd.yaml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/blank/tasks/peruser_linux.yaml b/ansible/roles/blank/tasks/peruser_linux.yaml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/blank/templates/foo.yaml.j2 b/ansible/roles/blank/templates/foo.yaml.j2 new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/zsh/handlers/main.yaml b/ansible/roles/zsh/handlers/main.yaml deleted file mode 100644 index 0fb3dee..0000000 --- a/ansible/roles/zsh/handlers/main.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- name: restart zrepl - service: - name: zrepl - state: restarted diff --git a/ansible/roles/zsh/tasks/main.yaml b/ansible/roles/zsh/tasks/main.yaml index c4f2d20..d7c1735 100644 --- a/ansible/roles/zsh/tasks/main.yaml +++ b/ansible/roles/zsh/tasks/main.yaml @@ -3,3 +3,12 @@ - import_tasks: tasks/linux.yaml when: 'os_flavor == "linux"' + +- include_tasks: + file: tasks/peruser.yaml + apply: + become: yes + become_user: "{{ initialize_user }}" + loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}" + loop_control: + loop_var: initialize_user