From 593717d10f97e7d7b4cd8024be3618cdc6e5b9f6 Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Thu, 22 Sep 2022 23:01:27 +0200 Subject: [PATCH] Compartamentalise playbooks --- .gitignore | 5 ++-- vars => group_vars/.template | 11 ++++---- host_vars/.template | 24 +++++++++++++++++ hosts.yml | 26 ------------------- .../filesystem}/common/etc/aliases.j2 | 0 .../common/etc/apt/apt.conf.d/20auto-upgrades | 0 .../etc/apt/apt.conf.d/50unattended-upgrades | 0 .../common/etc/fail2ban/jail.d/sshd.local.j2 | 0 .../common/etc/fail2ban/jail.local.j2 | 0 .../etc/logcheck/ignore.d.server/hostname.j2 | 0 .../common/etc/logcheck/logcheck.conf | 0 .../filesystem}/common/etc/mailname.j2 | 0 .../filesystem}/common/etc/mailutils.conf.j2 | 0 .../filesystem}/common/etc/nftables.conf.j2 | 0 .../filesystem}/common/etc/pam.d/su | 0 .../filesystem}/common/etc/postfix/main.cf.j2 | 0 .../common/etc/postfix/sasl_passwd.j2 | 0 .../etc/ssh/sshd_config.d/00-local.conf.j2 | 0 .../filesystem}/common/home/user/bashrc | 0 .../filesystem}/common/home/user/tmux.conf | 0 .../filesystem}/valkyrie/etc/motd | 0 .../yggdrasil/etc/apcupsd/apcupsd.conf | 0 .../filesystem}/yggdrasil/etc/motd | 0 .../filesystem}/yggdrasil/etc/smartd.conf | 0 .../etc/systemd/system/status-mail@.service | 0 .../systemd/system/zfs-scrub-monthly@.timer | 0 .../etc/systemd/system/zfs-scrub@.service | 0 .../systemd/system/zfs-trim-monthly@.timer | 0 .../etc/systemd/system/zfs-trim@.service | 0 .../sbin/systemd-mail-systemctl-status.j2 | 0 .../local/sbin/systemd-mail-zpool-status.j2 | 0 playbooks/hosts.yml | 26 +++++++++++++++++++ {tasks => playbooks/tasks/hosts}/fail2ban.yml | 0 {tasks => playbooks/tasks/hosts}/firewall.yml | 0 {tasks => playbooks/tasks/hosts}/fstrim.yml | 0 {tasks => playbooks/tasks/hosts}/logs.yml | 0 {tasks => playbooks/tasks/hosts}/mail.yml | 0 {tasks => playbooks/tasks/hosts}/motd.yml | 0 {tasks => playbooks/tasks/hosts}/ntp.yml | 0 .../tasks/hosts}/root-shell.yml | 0 {tasks => playbooks/tasks/hosts}/smart.yml | 2 +- {tasks => playbooks/tasks/hosts}/sshd.yml | 0 .../tasks/hosts}/systemd-mail.yml | 4 +-- .../tasks/hosts}/unattended-upgrades.yml | 0 {tasks => playbooks/tasks/hosts}/ups.yml | 2 +- {tasks => playbooks/tasks/hosts}/user.yml | 0 {tasks => playbooks/tasks/hosts}/utils.yml | 0 .../tasks/hosts}/zfs-scrub.yml | 6 ++--- {tasks => playbooks/tasks/hosts}/zfs-trim.yml | 4 +-- .../tasks/hosts}/zfsutils-cron.yml | 0 50 files changed, 67 insertions(+), 43 deletions(-) rename vars => group_vars/.template (55%) create mode 100644 host_vars/.template delete mode 100644 hosts.yml rename {filesystem => playbooks/filesystem}/common/etc/aliases.j2 (100%) rename {filesystem => playbooks/filesystem}/common/etc/apt/apt.conf.d/20auto-upgrades (100%) rename {filesystem => playbooks/filesystem}/common/etc/apt/apt.conf.d/50unattended-upgrades (100%) rename {filesystem => playbooks/filesystem}/common/etc/fail2ban/jail.d/sshd.local.j2 (100%) rename {filesystem => playbooks/filesystem}/common/etc/fail2ban/jail.local.j2 (100%) rename {filesystem => playbooks/filesystem}/common/etc/logcheck/ignore.d.server/hostname.j2 (100%) rename {filesystem => playbooks/filesystem}/common/etc/logcheck/logcheck.conf (100%) rename {filesystem => playbooks/filesystem}/common/etc/mailname.j2 (100%) rename {filesystem => playbooks/filesystem}/common/etc/mailutils.conf.j2 (100%) rename {filesystem => playbooks/filesystem}/common/etc/nftables.conf.j2 (100%) rename {filesystem => playbooks/filesystem}/common/etc/pam.d/su (100%) rename {filesystem => playbooks/filesystem}/common/etc/postfix/main.cf.j2 (100%) rename {filesystem => playbooks/filesystem}/common/etc/postfix/sasl_passwd.j2 (100%) rename {filesystem => playbooks/filesystem}/common/etc/ssh/sshd_config.d/00-local.conf.j2 (100%) rename {filesystem => playbooks/filesystem}/common/home/user/bashrc (100%) rename {filesystem => playbooks/filesystem}/common/home/user/tmux.conf (100%) rename {filesystem => playbooks/filesystem}/valkyrie/etc/motd (100%) rename {filesystem => playbooks/filesystem}/yggdrasil/etc/apcupsd/apcupsd.conf (100%) rename {filesystem => playbooks/filesystem}/yggdrasil/etc/motd (100%) rename {filesystem => playbooks/filesystem}/yggdrasil/etc/smartd.conf (100%) rename {filesystem => playbooks/filesystem}/yggdrasil/etc/systemd/system/status-mail@.service (100%) rename {filesystem => playbooks/filesystem}/yggdrasil/etc/systemd/system/zfs-scrub-monthly@.timer (100%) rename {filesystem => playbooks/filesystem}/yggdrasil/etc/systemd/system/zfs-scrub@.service (100%) rename {filesystem => playbooks/filesystem}/yggdrasil/etc/systemd/system/zfs-trim-monthly@.timer (100%) rename {filesystem => playbooks/filesystem}/yggdrasil/etc/systemd/system/zfs-trim@.service (100%) rename {filesystem => playbooks/filesystem}/yggdrasil/usr/local/sbin/systemd-mail-systemctl-status.j2 (100%) rename {filesystem => playbooks/filesystem}/yggdrasil/usr/local/sbin/systemd-mail-zpool-status.j2 (100%) create mode 100644 playbooks/hosts.yml rename {tasks => playbooks/tasks/hosts}/fail2ban.yml (100%) rename {tasks => playbooks/tasks/hosts}/firewall.yml (100%) rename {tasks => playbooks/tasks/hosts}/fstrim.yml (100%) rename {tasks => playbooks/tasks/hosts}/logs.yml (100%) rename {tasks => playbooks/tasks/hosts}/mail.yml (100%) rename {tasks => playbooks/tasks/hosts}/motd.yml (100%) rename {tasks => playbooks/tasks/hosts}/ntp.yml (100%) rename {tasks => playbooks/tasks/hosts}/root-shell.yml (100%) rename {tasks => playbooks/tasks/hosts}/smart.yml (86%) rename {tasks => playbooks/tasks/hosts}/sshd.yml (100%) rename {tasks => playbooks/tasks/hosts}/systemd-mail.yml (68%) rename {tasks => playbooks/tasks/hosts}/unattended-upgrades.yml (100%) rename {tasks => playbooks/tasks/hosts}/ups.yml (84%) rename {tasks => playbooks/tasks/hosts}/user.yml (100%) rename {tasks => playbooks/tasks/hosts}/utils.yml (100%) rename {tasks => playbooks/tasks/hosts}/zfs-scrub.yml (76%) rename {tasks => playbooks/tasks/hosts}/zfs-trim.yml (80%) rename {tasks => playbooks/tasks/hosts}/zfsutils-cron.yml (100%) diff --git a/.gitignore b/.gitignore index 4dbdf70..1113ff9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -group_vars/** -host_vars/** +group_vars/the_nine_worlds +host_vars/valkyrie +host_vars/yggdrasil diff --git a/vars b/group_vars/.template similarity index 55% rename from vars rename to group_vars/.template index ca089f5..232ae04 100644 --- a/vars +++ b/group_vars/.template @@ -1,5 +1,3 @@ -# Set the variables and move to group_vars/ and host_vars/ as required and encrypt. - # Ansible variables ansible_port: ansible_become_password: @@ -9,12 +7,13 @@ ssh_user: # Machine variables domain: -subnet_address: -subnet_masklen: -subnet: # Postfix variables postfix_smtp_server: postfix_smtp_port: postfix_smtp_user: -postfix_smtp_pass: + +# VPN network variables +vpn_wg0_port: +vpn_wg0_netmask: +vpn_wg0_preshared_key: diff --git a/host_vars/.template b/host_vars/.template new file mode 100644 index 0000000..ffa40f8 --- /dev/null +++ b/host_vars/.template @@ -0,0 +1,24 @@ +# Machine variables +subnet_address: +subnet_masklen: +subnet: +ethx: + +# Postfix variables +postfix_smtp_pass: + +# VPN network variables +vpn_subnet_id: +vpn_remote_id: + +vpn_br0_address: +vpn_br0_broadcast: +vpn_br0_netmask: + +vpn_wg0_address: +vpn_wg0_interface_private_key: +vpn_wg0_peer_public_key: + +vpn_remote_subnet: + +vpn_reverse_proxy_address: diff --git a/hosts.yml b/hosts.yml deleted file mode 100644 index b0c5f46..0000000 --- a/hosts.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- hosts: the_nine_worlds - - tasks: - - import_tasks: tasks/sshd.yml - - import_tasks: tasks/firewall.yml - - import_tasks: tasks/ntp.yml - - import_tasks: tasks/mail.yml - - import_tasks: tasks/unattended-upgrades.yml - - import_tasks: tasks/fail2ban.yml - - import_tasks: tasks/fstrim.yml - - import_tasks: tasks/logs.yml - - import_tasks: tasks/motd.yml - - import_tasks: tasks/utils.yml - - import_tasks: tasks/user.yml - - import_tasks: tasks/root-shell.yml - -- hosts: yggdrasil - - tasks: - - import_tasks: tasks/systemd-mail.yml - - import_tasks: tasks/zfs-scrub.yml - - import_tasks: tasks/zfs-trim.yml - - import_tasks: tasks/zfsutils-cron.yml - - import_tasks: tasks/ups.yml - - import_tasks: tasks/smart.yml diff --git a/filesystem/common/etc/aliases.j2 b/playbooks/filesystem/common/etc/aliases.j2 similarity index 100% rename from filesystem/common/etc/aliases.j2 rename to playbooks/filesystem/common/etc/aliases.j2 diff --git a/filesystem/common/etc/apt/apt.conf.d/20auto-upgrades b/playbooks/filesystem/common/etc/apt/apt.conf.d/20auto-upgrades similarity index 100% rename from filesystem/common/etc/apt/apt.conf.d/20auto-upgrades rename to playbooks/filesystem/common/etc/apt/apt.conf.d/20auto-upgrades diff --git a/filesystem/common/etc/apt/apt.conf.d/50unattended-upgrades b/playbooks/filesystem/common/etc/apt/apt.conf.d/50unattended-upgrades similarity index 100% rename from filesystem/common/etc/apt/apt.conf.d/50unattended-upgrades rename to playbooks/filesystem/common/etc/apt/apt.conf.d/50unattended-upgrades diff --git a/filesystem/common/etc/fail2ban/jail.d/sshd.local.j2 b/playbooks/filesystem/common/etc/fail2ban/jail.d/sshd.local.j2 similarity index 100% rename from filesystem/common/etc/fail2ban/jail.d/sshd.local.j2 rename to playbooks/filesystem/common/etc/fail2ban/jail.d/sshd.local.j2 diff --git a/filesystem/common/etc/fail2ban/jail.local.j2 b/playbooks/filesystem/common/etc/fail2ban/jail.local.j2 similarity index 100% rename from filesystem/common/etc/fail2ban/jail.local.j2 rename to playbooks/filesystem/common/etc/fail2ban/jail.local.j2 diff --git a/filesystem/common/etc/logcheck/ignore.d.server/hostname.j2 b/playbooks/filesystem/common/etc/logcheck/ignore.d.server/hostname.j2 similarity index 100% rename from filesystem/common/etc/logcheck/ignore.d.server/hostname.j2 rename to playbooks/filesystem/common/etc/logcheck/ignore.d.server/hostname.j2 diff --git a/filesystem/common/etc/logcheck/logcheck.conf b/playbooks/filesystem/common/etc/logcheck/logcheck.conf similarity index 100% rename from filesystem/common/etc/logcheck/logcheck.conf rename to playbooks/filesystem/common/etc/logcheck/logcheck.conf diff --git a/filesystem/common/etc/mailname.j2 b/playbooks/filesystem/common/etc/mailname.j2 similarity index 100% rename from filesystem/common/etc/mailname.j2 rename to playbooks/filesystem/common/etc/mailname.j2 diff --git a/filesystem/common/etc/mailutils.conf.j2 b/playbooks/filesystem/common/etc/mailutils.conf.j2 similarity index 100% rename from filesystem/common/etc/mailutils.conf.j2 rename to playbooks/filesystem/common/etc/mailutils.conf.j2 diff --git a/filesystem/common/etc/nftables.conf.j2 b/playbooks/filesystem/common/etc/nftables.conf.j2 similarity index 100% rename from filesystem/common/etc/nftables.conf.j2 rename to playbooks/filesystem/common/etc/nftables.conf.j2 diff --git a/filesystem/common/etc/pam.d/su b/playbooks/filesystem/common/etc/pam.d/su similarity index 100% rename from filesystem/common/etc/pam.d/su rename to playbooks/filesystem/common/etc/pam.d/su diff --git a/filesystem/common/etc/postfix/main.cf.j2 b/playbooks/filesystem/common/etc/postfix/main.cf.j2 similarity index 100% rename from filesystem/common/etc/postfix/main.cf.j2 rename to playbooks/filesystem/common/etc/postfix/main.cf.j2 diff --git a/filesystem/common/etc/postfix/sasl_passwd.j2 b/playbooks/filesystem/common/etc/postfix/sasl_passwd.j2 similarity index 100% rename from filesystem/common/etc/postfix/sasl_passwd.j2 rename to playbooks/filesystem/common/etc/postfix/sasl_passwd.j2 diff --git a/filesystem/common/etc/ssh/sshd_config.d/00-local.conf.j2 b/playbooks/filesystem/common/etc/ssh/sshd_config.d/00-local.conf.j2 similarity index 100% rename from filesystem/common/etc/ssh/sshd_config.d/00-local.conf.j2 rename to playbooks/filesystem/common/etc/ssh/sshd_config.d/00-local.conf.j2 diff --git a/filesystem/common/home/user/bashrc b/playbooks/filesystem/common/home/user/bashrc similarity index 100% rename from filesystem/common/home/user/bashrc rename to playbooks/filesystem/common/home/user/bashrc diff --git a/filesystem/common/home/user/tmux.conf b/playbooks/filesystem/common/home/user/tmux.conf similarity index 100% rename from filesystem/common/home/user/tmux.conf rename to playbooks/filesystem/common/home/user/tmux.conf diff --git a/filesystem/valkyrie/etc/motd b/playbooks/filesystem/valkyrie/etc/motd similarity index 100% rename from filesystem/valkyrie/etc/motd rename to playbooks/filesystem/valkyrie/etc/motd diff --git a/filesystem/yggdrasil/etc/apcupsd/apcupsd.conf b/playbooks/filesystem/yggdrasil/etc/apcupsd/apcupsd.conf similarity index 100% rename from filesystem/yggdrasil/etc/apcupsd/apcupsd.conf rename to playbooks/filesystem/yggdrasil/etc/apcupsd/apcupsd.conf diff --git a/filesystem/yggdrasil/etc/motd b/playbooks/filesystem/yggdrasil/etc/motd similarity index 100% rename from filesystem/yggdrasil/etc/motd rename to playbooks/filesystem/yggdrasil/etc/motd diff --git a/filesystem/yggdrasil/etc/smartd.conf b/playbooks/filesystem/yggdrasil/etc/smartd.conf similarity index 100% rename from filesystem/yggdrasil/etc/smartd.conf rename to playbooks/filesystem/yggdrasil/etc/smartd.conf diff --git a/filesystem/yggdrasil/etc/systemd/system/status-mail@.service b/playbooks/filesystem/yggdrasil/etc/systemd/system/status-mail@.service similarity index 100% rename from filesystem/yggdrasil/etc/systemd/system/status-mail@.service rename to playbooks/filesystem/yggdrasil/etc/systemd/system/status-mail@.service diff --git a/filesystem/yggdrasil/etc/systemd/system/zfs-scrub-monthly@.timer b/playbooks/filesystem/yggdrasil/etc/systemd/system/zfs-scrub-monthly@.timer similarity index 100% rename from filesystem/yggdrasil/etc/systemd/system/zfs-scrub-monthly@.timer rename to playbooks/filesystem/yggdrasil/etc/systemd/system/zfs-scrub-monthly@.timer diff --git a/filesystem/yggdrasil/etc/systemd/system/zfs-scrub@.service b/playbooks/filesystem/yggdrasil/etc/systemd/system/zfs-scrub@.service similarity index 100% rename from filesystem/yggdrasil/etc/systemd/system/zfs-scrub@.service rename to playbooks/filesystem/yggdrasil/etc/systemd/system/zfs-scrub@.service diff --git a/filesystem/yggdrasil/etc/systemd/system/zfs-trim-monthly@.timer b/playbooks/filesystem/yggdrasil/etc/systemd/system/zfs-trim-monthly@.timer similarity index 100% rename from filesystem/yggdrasil/etc/systemd/system/zfs-trim-monthly@.timer rename to playbooks/filesystem/yggdrasil/etc/systemd/system/zfs-trim-monthly@.timer diff --git a/filesystem/yggdrasil/etc/systemd/system/zfs-trim@.service b/playbooks/filesystem/yggdrasil/etc/systemd/system/zfs-trim@.service similarity index 100% rename from filesystem/yggdrasil/etc/systemd/system/zfs-trim@.service rename to playbooks/filesystem/yggdrasil/etc/systemd/system/zfs-trim@.service diff --git a/filesystem/yggdrasil/usr/local/sbin/systemd-mail-systemctl-status.j2 b/playbooks/filesystem/yggdrasil/usr/local/sbin/systemd-mail-systemctl-status.j2 similarity index 100% rename from filesystem/yggdrasil/usr/local/sbin/systemd-mail-systemctl-status.j2 rename to playbooks/filesystem/yggdrasil/usr/local/sbin/systemd-mail-systemctl-status.j2 diff --git a/filesystem/yggdrasil/usr/local/sbin/systemd-mail-zpool-status.j2 b/playbooks/filesystem/yggdrasil/usr/local/sbin/systemd-mail-zpool-status.j2 similarity index 100% rename from filesystem/yggdrasil/usr/local/sbin/systemd-mail-zpool-status.j2 rename to playbooks/filesystem/yggdrasil/usr/local/sbin/systemd-mail-zpool-status.j2 diff --git a/playbooks/hosts.yml b/playbooks/hosts.yml new file mode 100644 index 0000000..1d7da52 --- /dev/null +++ b/playbooks/hosts.yml @@ -0,0 +1,26 @@ +--- +- hosts: the_nine_worlds + + tasks: + - import_tasks: tasks/hosts/sshd.yml + - import_tasks: tasks/hosts/firewall.yml + - import_tasks: tasks/hosts/ntp.yml + - import_tasks: tasks/hosts/mail.yml + - import_tasks: tasks/hosts/unattended-upgrades.yml + - import_tasks: tasks/hosts/fail2ban.yml + - import_tasks: tasks/hosts/fstrim.yml + - import_tasks: tasks/hosts/logs.yml + - import_tasks: tasks/hosts/motd.yml + - import_tasks: tasks/hosts/utils.yml + - import_tasks: tasks/hosts/user.yml + - import_tasks: tasks/hosts/root-shell.yml + +- hosts: yggdrasil + + tasks: + - import_tasks: tasks/hosts/systemd-mail.yml + - import_tasks: tasks/hosts/zfs-scrub.yml + - import_tasks: tasks/hosts/zfs-trim.yml + - import_tasks: tasks/hosts/zfsutils-cron.yml + - import_tasks: tasks/hosts/ups.yml + - import_tasks: tasks/hosts/smart.yml diff --git a/tasks/fail2ban.yml b/playbooks/tasks/hosts/fail2ban.yml similarity index 100% rename from tasks/fail2ban.yml rename to playbooks/tasks/hosts/fail2ban.yml diff --git a/tasks/firewall.yml b/playbooks/tasks/hosts/firewall.yml similarity index 100% rename from tasks/firewall.yml rename to playbooks/tasks/hosts/firewall.yml diff --git a/tasks/fstrim.yml b/playbooks/tasks/hosts/fstrim.yml similarity index 100% rename from tasks/fstrim.yml rename to playbooks/tasks/hosts/fstrim.yml diff --git a/tasks/logs.yml b/playbooks/tasks/hosts/logs.yml similarity index 100% rename from tasks/logs.yml rename to playbooks/tasks/hosts/logs.yml diff --git a/tasks/mail.yml b/playbooks/tasks/hosts/mail.yml similarity index 100% rename from tasks/mail.yml rename to playbooks/tasks/hosts/mail.yml diff --git a/tasks/motd.yml b/playbooks/tasks/hosts/motd.yml similarity index 100% rename from tasks/motd.yml rename to playbooks/tasks/hosts/motd.yml diff --git a/tasks/ntp.yml b/playbooks/tasks/hosts/ntp.yml similarity index 100% rename from tasks/ntp.yml rename to playbooks/tasks/hosts/ntp.yml diff --git a/tasks/root-shell.yml b/playbooks/tasks/hosts/root-shell.yml similarity index 100% rename from tasks/root-shell.yml rename to playbooks/tasks/hosts/root-shell.yml diff --git a/tasks/smart.yml b/playbooks/tasks/hosts/smart.yml similarity index 86% rename from tasks/smart.yml rename to playbooks/tasks/hosts/smart.yml index f09871e..4b3d928 100644 --- a/tasks/smart.yml +++ b/playbooks/tasks/hosts/smart.yml @@ -4,7 +4,7 @@ - name: Smartd configuration copy: - src: ./filesystem/yggdrasil/etc/smartd.conf + src: ./filesystem/{{ ansible_hostname }}/etc/smartd.conf dest: /etc/smartd.conf mode: 0644 register: smartd_conf diff --git a/tasks/sshd.yml b/playbooks/tasks/hosts/sshd.yml similarity index 100% rename from tasks/sshd.yml rename to playbooks/tasks/hosts/sshd.yml diff --git a/tasks/systemd-mail.yml b/playbooks/tasks/hosts/systemd-mail.yml similarity index 68% rename from tasks/systemd-mail.yml rename to playbooks/tasks/hosts/systemd-mail.yml index c7e1f26..504722a 100644 --- a/tasks/systemd-mail.yml +++ b/playbooks/tasks/hosts/systemd-mail.yml @@ -1,12 +1,12 @@ - name: SystemD mail script template: - src: ./filesystem/yggdrasil/usr/local/sbin/systemd-mail-systemctl-status.j2 + src: ./filesystem/{{ ansible_hostname }}/usr/local/sbin/systemd-mail-systemctl-status.j2 dest: /usr/local/sbin/systemd-mail-systemctl-status mode: 0755 - name: SystemD mail service copy: - src: ./filesystem/yggdrasil/etc/systemd/system/status-mail@.service + src: ./filesystem/{{ ansible_hostname }}/etc/systemd/system/status-mail@.service dest: /etc/systemd/system/status-mail@.service mode: 0644 register: systemd_status_mail_service_file diff --git a/tasks/unattended-upgrades.yml b/playbooks/tasks/hosts/unattended-upgrades.yml similarity index 100% rename from tasks/unattended-upgrades.yml rename to playbooks/tasks/hosts/unattended-upgrades.yml diff --git a/tasks/ups.yml b/playbooks/tasks/hosts/ups.yml similarity index 84% rename from tasks/ups.yml rename to playbooks/tasks/hosts/ups.yml index 6cc8cc5..163269d 100644 --- a/tasks/ups.yml +++ b/playbooks/tasks/hosts/ups.yml @@ -4,7 +4,7 @@ - name: Apcupsd configuration copy: - src: ./filesystem/yggdrasil/etc/apcupsd/apcupsd.conf + src: ./filesystem/{{ ansible_hostname }}/etc/apcupsd/apcupsd.conf dest: /etc/apcupsd/apcupsd.conf mode: 0644 register: apcupsd_conf diff --git a/tasks/user.yml b/playbooks/tasks/hosts/user.yml similarity index 100% rename from tasks/user.yml rename to playbooks/tasks/hosts/user.yml diff --git a/tasks/utils.yml b/playbooks/tasks/hosts/utils.yml similarity index 100% rename from tasks/utils.yml rename to playbooks/tasks/hosts/utils.yml diff --git a/tasks/zfs-scrub.yml b/playbooks/tasks/hosts/zfs-scrub.yml similarity index 76% rename from tasks/zfs-scrub.yml rename to playbooks/tasks/hosts/zfs-scrub.yml index 474ceef..52ff8bd 100644 --- a/tasks/zfs-scrub.yml +++ b/playbooks/tasks/hosts/zfs-scrub.yml @@ -1,19 +1,19 @@ - name: Zpool status mail script template: - src: ./filesystem/yggdrasil/usr/local/sbin/systemd-mail-zpool-status.j2 + src: ./filesystem/{{ ansible_hostname }}/usr/local/sbin/systemd-mail-zpool-status.j2 dest: /usr/local/sbin/systemd-mail-zpool-status mode: 0755 - name: Zfs scrub service file copy: - src: ./filesystem/yggdrasil/etc/systemd/system/zfs-scrub@.service + src: ./filesystem/{{ ansible_hostname }}/etc/systemd/system/zfs-scrub@.service dest: /etc/systemd/system/zfs-scrub@.service mode: 0644 register: systemd_zfs_scrub_service_file - name: Zfs scrub timer file copy: - src: ./filesystem/yggdrasil/etc/systemd/system/zfs-scrub-monthly@.timer + src: ./filesystem/{{ ansible_hostname }}/etc/systemd/system/zfs-scrub-monthly@.timer dest: /etc/systemd/system/zfs-scrub-monthly@.timer mode: 0644 register: systemd_zfs_scrub_monthly_timer_file diff --git a/tasks/zfs-trim.yml b/playbooks/tasks/hosts/zfs-trim.yml similarity index 80% rename from tasks/zfs-trim.yml rename to playbooks/tasks/hosts/zfs-trim.yml index 792ae7f..63836f5 100644 --- a/tasks/zfs-trim.yml +++ b/playbooks/tasks/hosts/zfs-trim.yml @@ -1,13 +1,13 @@ - name: Zfs trim service file copy: - src: ./filesystem/yggdrasil/etc/systemd/system/zfs-trim@.service + src: ./filesystem/{{ ansible_hostname }}/etc/systemd/system/zfs-trim@.service dest: /etc/systemd/system/zfs-trim@.service mode: 0644 register: systemd_zfs_trim_service_file - name: Zfs trim timer file copy: - src: ./filesystem/yggdrasil/etc/systemd/system/zfs-trim-monthly@.timer + src: ./filesystem/{{ ansible_hostname }}/etc/systemd/system/zfs-trim-monthly@.timer dest: /etc/systemd/system/zfs-trim-monthly@.timer mode: 0644 register: systemd_zfs_trim_monthly_timer_file diff --git a/tasks/zfsutils-cron.yml b/playbooks/tasks/hosts/zfsutils-cron.yml similarity index 100% rename from tasks/zfsutils-cron.yml rename to playbooks/tasks/hosts/zfsutils-cron.yml