From 523b5cd49f507fc5f0f3b0255b72a3f006996962 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sat, 15 Mar 2025 00:13:27 +0100 Subject: [PATCH] Use "all" directory for groups --- files/personal/{ => all}/gpg/gpg_key | 0 files/personal/{ => all}/gpg/gpg_pub | 0 playbook.yml | 8 ++++---- tasks/git.yml | 4 ++-- tasks/personal/{ => all}/mpd.yml | 10 +++++----- tasks/personal/{ => all}/mpv.yml | 4 ++-- tasks/personal/{ => all}/syncthing.yml | 0 tasks/personal/{ => all}/wireguard.yml | 0 templates/personal/{ => all}/mpd/mpd.conf.j2 | 0 templates/personal/{ => all}/mpd/ncmpc.j2 | 0 templates/personal/{ => all}/mpd/ncmpcpp/bindings.j2 | 0 templates/personal/{ => all}/mpd/ncmpcpp/config.j2 | 0 templates/personal/{ => all}/mpd/service.j2 | 0 templates/personal/{ => all}/mpd/socket.j2 | 0 templates/personal/{ => all}/mpv/config.j2 | 0 templates/personal/{ => all}/mpv/input.j2 | 0 16 files changed, 13 insertions(+), 13 deletions(-) rename files/personal/{ => all}/gpg/gpg_key (100%) rename files/personal/{ => all}/gpg/gpg_pub (100%) rename tasks/personal/{ => all}/mpd.yml (87%) rename tasks/personal/{ => all}/mpv.yml (80%) rename tasks/personal/{ => all}/syncthing.yml (100%) rename tasks/personal/{ => all}/wireguard.yml (100%) rename templates/personal/{ => all}/mpd/mpd.conf.j2 (100%) rename templates/personal/{ => all}/mpd/ncmpc.j2 (100%) rename templates/personal/{ => all}/mpd/ncmpcpp/bindings.j2 (100%) rename templates/personal/{ => all}/mpd/ncmpcpp/config.j2 (100%) rename templates/personal/{ => all}/mpd/service.j2 (100%) rename templates/personal/{ => all}/mpd/socket.j2 (100%) rename templates/personal/{ => all}/mpv/config.j2 (100%) rename templates/personal/{ => all}/mpv/input.j2 (100%) diff --git a/files/personal/gpg/gpg_key b/files/personal/all/gpg/gpg_key similarity index 100% rename from files/personal/gpg/gpg_key rename to files/personal/all/gpg/gpg_key diff --git a/files/personal/gpg/gpg_pub b/files/personal/all/gpg/gpg_pub similarity index 100% rename from files/personal/gpg/gpg_pub rename to files/personal/all/gpg/gpg_pub diff --git a/playbook.yml b/playbook.yml index a604be7..2f99cf1 100644 --- a/playbook.yml +++ b/playbook.yml @@ -37,19 +37,19 @@ when: "'personal' in group_names" block: - name: Wireguard provisioning - ansible.builtin.import_tasks: 'tasks/personal/wireguard.yml' + ansible.builtin.import_tasks: 'tasks/personal/all/wireguard.yml' tags: wireguard - name: MPV provisioning - ansible.builtin.import_tasks: 'tasks/personal/mpv.yml' + ansible.builtin.import_tasks: 'tasks/personal/all/mpv.yml' tags: mpv - name: MPD provisioning - ansible.builtin.import_tasks: 'tasks/personal/mpd.yml' + ansible.builtin.import_tasks: 'tasks/personal/all/mpd.yml' tags: mpd - name: Syncthing provisioning - ansible.builtin.import_tasks: 'tasks/personal/syncthing.yml' + ansible.builtin.import_tasks: 'tasks/personal/all/syncthing.yml' tags: syncthing - name: Desktop provisioning diff --git a/tasks/git.yml b/tasks/git.yml index a375d3b..63185b2 100644 --- a/tasks/git.yml +++ b/tasks/git.yml @@ -10,9 +10,9 @@ dest: '{{ item.dest }}' mode: '0755' loop: - - src: 'files/personal/gpg/gpg_key' + - src: 'files/personal/all/gpg/gpg_key' dest: '{{ ansible_env.HOME }}/gpg.key' - - src: 'files/personal/gpg/gpg_pub' + - src: 'files/personal/all/gpg/gpg_pub' dest: '{{ ansible_env.HOME }}/gpg.pub' - name: Import secret key diff --git a/tasks/personal/mpd.yml b/tasks/personal/all/mpd.yml similarity index 87% rename from tasks/personal/mpd.yml rename to tasks/personal/all/mpd.yml index 8126cf1..41b1467 100644 --- a/tasks/personal/mpd.yml +++ b/tasks/personal/all/mpd.yml @@ -4,10 +4,10 @@ dest: '{{ item.dest }}' mode: '0644' loop: - - src: 'templates/personal/mpd/service.j2' + - src: 'templates/personal/all/mpd/service.j2' dest: '{{ xdg_config_dir }}/systemd/user/mpd.service' - - src: 'templates/personal/mpd/socket.j2' + - src: 'templates/personal/all/mpd/socket.j2' dest: '{{ xdg_config_dir }}/systemd/user/mpd.socket' notify: - stop mpd service @@ -51,11 +51,11 @@ dest: '{{ item.dest }}' mode: '0755' loop: - - src: 'templates/personal/mpd/mpd.conf.j2' + - src: 'templates/personal/all/mpd/mpd.conf.j2' dest: '{{ mpd_configuration_dir }}/mpd.conf' - - src: 'templates/personal/mpd/ncmpcpp/config.j2' + - src: 'templates/personal/all/mpd/ncmpcpp/config.j2' dest: '{{ ncmpcpp_configuration_dir }}/config' - - src: 'templates/personal/mpd/ncmpcpp/bindings.j2' + - src: 'templates/personal/all/mpd/ncmpcpp/bindings.j2' dest: '{{ ncmpcpp_configuration_dir }}/bindings' notify: - stop mpd service diff --git a/tasks/personal/mpv.yml b/tasks/personal/all/mpv.yml similarity index 80% rename from tasks/personal/mpv.yml rename to tasks/personal/all/mpv.yml index 3b1e48f..5369c93 100644 --- a/tasks/personal/mpv.yml +++ b/tasks/personal/all/mpv.yml @@ -10,7 +10,7 @@ dest: '{{ item.dest }}' mode: '0644' loop: - - src: 'templates/personal/mpv/input.j2' + - src: 'templates/personal/all/mpv/input.j2' dest: '{{ ansible_env.HOME }}/.config/mpv/input.conf' - - src: 'templates/personal/mpv/config.j2' + - src: 'templates/personal/all/mpv/config.j2' dest: '{{ ansible_env.HOME }}/.config/mpv/mpv.conf' diff --git a/tasks/personal/syncthing.yml b/tasks/personal/all/syncthing.yml similarity index 100% rename from tasks/personal/syncthing.yml rename to tasks/personal/all/syncthing.yml diff --git a/tasks/personal/wireguard.yml b/tasks/personal/all/wireguard.yml similarity index 100% rename from tasks/personal/wireguard.yml rename to tasks/personal/all/wireguard.yml diff --git a/templates/personal/mpd/mpd.conf.j2 b/templates/personal/all/mpd/mpd.conf.j2 similarity index 100% rename from templates/personal/mpd/mpd.conf.j2 rename to templates/personal/all/mpd/mpd.conf.j2 diff --git a/templates/personal/mpd/ncmpc.j2 b/templates/personal/all/mpd/ncmpc.j2 similarity index 100% rename from templates/personal/mpd/ncmpc.j2 rename to templates/personal/all/mpd/ncmpc.j2 diff --git a/templates/personal/mpd/ncmpcpp/bindings.j2 b/templates/personal/all/mpd/ncmpcpp/bindings.j2 similarity index 100% rename from templates/personal/mpd/ncmpcpp/bindings.j2 rename to templates/personal/all/mpd/ncmpcpp/bindings.j2 diff --git a/templates/personal/mpd/ncmpcpp/config.j2 b/templates/personal/all/mpd/ncmpcpp/config.j2 similarity index 100% rename from templates/personal/mpd/ncmpcpp/config.j2 rename to templates/personal/all/mpd/ncmpcpp/config.j2 diff --git a/templates/personal/mpd/service.j2 b/templates/personal/all/mpd/service.j2 similarity index 100% rename from templates/personal/mpd/service.j2 rename to templates/personal/all/mpd/service.j2 diff --git a/templates/personal/mpd/socket.j2 b/templates/personal/all/mpd/socket.j2 similarity index 100% rename from templates/personal/mpd/socket.j2 rename to templates/personal/all/mpd/socket.j2 diff --git a/templates/personal/mpv/config.j2 b/templates/personal/all/mpv/config.j2 similarity index 100% rename from templates/personal/mpv/config.j2 rename to templates/personal/all/mpv/config.j2 diff --git a/templates/personal/mpv/input.j2 b/templates/personal/all/mpv/input.j2 similarity index 100% rename from templates/personal/mpv/input.j2 rename to templates/personal/all/mpv/input.j2