From 3c5ede3e8a061c1817c429a5332dcf7bc76ec415 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sun, 11 Dec 2022 02:38:22 +0300 Subject: [PATCH] Feat: Rename `*.yml` to `*.yaml` --- playbooks/ansible/{cleanup-tmp.yml => cleanup-tmp.yaml} | 0 playbooks/ansible/{list-tmp.yml => list-tmp.yaml} | 0 playbooks/ansible/{show_facts.yml => show_facts.yaml} | 0 .../{cleanup-pip-cache.yml => cleanup-pip-cache.yaml} | 0 .../debian/{init-local-phd.yml => init-local-phd.yaml} | 0 playbooks/debian/init-system.sh | 4 ++-- playbooks/debian/{sa-merge-all.yml => sa-merge-all.yaml} | 0 .../debian/{update-all-apt.yml => update-all-apt.yaml} | 0 playbooks/fetch-push/fetch | 2 +- playbooks/fetch-push/{fetch.yml => fetch.yaml} | 0 playbooks/fetch-push/push | 2 +- playbooks/fetch-push/{push.yml => push.yaml} | 0 playbooks/{init-system.yml => init-system.yaml} | 0 playbooks/{init-system2.yml => init-system2.yaml} | 0 playbooks/{logcheck.yml => logcheck.yaml} | 0 .../redhat/{init-local-phd.yml => init-local-phd.yaml} | 0 playbooks/redhat/init-system.sh | 4 ++-- .../redhat/{update-all-dnf.yml => update-all-dnf.yaml} | 0 .../tasks/{cleanup-user.yml => cleanup-user.yaml} | 0 .../roles/cleanup-pip-cache/tasks/{main.yml => main.yaml} | 8 ++++---- .../tasks/{show-user.yml => show-user.yaml} | 0 .../add-apache-vhost/handlers/{main.yml => main.yaml} | 0 .../debian/add-apache-vhost/meta/{main.yml => main.yaml} | 0 .../tasks/{add-vhost.yml => add-vhost.yaml} | 0 .../tasks/{dehydrated.yml => dehydrated.yaml} | 0 .../debian/add-apache-vhost/tasks/{main.yml => main.yaml} | 4 ++-- .../debian/add-dns-domain/meta/{main.yml => main.yaml} | 0 .../debian/add-dns-domain/tasks/{main.yml => main.yaml} | 0 .../roles/debian/apache/handlers/{main.yml => main.yaml} | 0 .../roles/debian/apache/meta/{main.yml => main.yaml} | 0 .../roles/debian/apache/tasks/{main.yml => main.yaml} | 0 .../roles/debian/dehydrated/meta/{main.yml => main.yaml} | 0 .../roles/debian/dehydrated/tasks/{main.yml => main.yaml} | 0 .../roles/debian/email/handlers/{main.yml => main.yaml} | 0 .../roles/debian/email/tasks/{main.yml => main.yaml} | 0 .../debian/firewall/handlers/{main.yml => main.yaml} | 0 .../roles/debian/firewall/tasks/{main.yml => main.yaml} | 0 .../roles/debian/gitweb/meta/{main.yml => main.yaml} | 0 .../roles/debian/gitweb/tasks/{main.yml => main.yaml} | 0 .../debian/init-logcheck/tasks/{main.yml => main.yaml} | 0 playbooks/roles/debian/named/meta/{main.yml => main.yaml} | 0 .../roles/debian/named/tasks/{main.yml => main.yaml} | 0 .../debian/remove-systemd/tasks/{main.yml => main.yaml} | 4 ++-- .../tasks/{remove-systemd.yml => remove-systemd.yaml} | 0 .../roles/debian/security/tasks/{main.yml => main.yaml} | 0 .../roles/dev-packages/tasks/{main.yml => main.yaml} | 0 playbooks/roles/docker/tasks/{main.yml => main.yaml} | 0 playbooks/roles/init-system/tasks/{apt.yml => apt.yaml} | 0 playbooks/roles/init-system/tasks/{dnf.yml => dnf.yaml} | 0 .../roles/init-system/tasks/{locales.yml => locales.yaml} | 0 playbooks/roles/init-system/tasks/{main.yml => main.yaml} | 6 +++--- playbooks/roles/logcheck/tasks/{main.yml => main.yaml} | 0 playbooks/roles/mariadb/tasks/{main.yml => main.yaml} | 0 playbooks/roles/ntpdate-hwc/tasks/{main.yml => main.yaml} | 0 playbooks/roles/openvpn/tasks/{main.yml => main.yaml} | 0 playbooks/roles/packages/tasks/{main.yml => main.yaml} | 0 playbooks/roles/phd/defaults/{main.yml => main.yaml} | 0 playbooks/roles/phd/meta/{main.yml => main.yaml} | 0 playbooks/roles/phd/tasks/{main.yml => main.yaml} | 0 playbooks/roles/postgres/tasks/{main.yml => main.yaml} | 0 .../python-dev-packages/meta/{main.yml => main.yaml} | 0 .../python-dev-packages/tasks/{main.yml => main.yaml} | 0 .../roles/python-packages/tasks/{main.yml => main.yaml} | 0 playbooks/roles/qemu/tasks/{main.yml => main.yaml} | 0 .../redhat/firewall/handlers/{main.yml => main.yaml} | 0 .../roles/redhat/firewall/tasks/{main.yml => main.yaml} | 0 playbooks/roles/root/meta/{main.yml => main.yaml} | 0 playbooks/roles/root/tasks/main.yaml | 5 +++++ playbooks/roles/root/tasks/main.yml | 5 ----- playbooks/roles/root/tasks/{mc.yml => mc.yaml} | 0 playbooks/roles/root/tasks/{root.yml => root.yaml} | 0 .../roles/setup-usrlocal/tasks/{main.yml => main.yaml} | 0 playbooks/roles/smbclient/tasks/{main.yml => main.yaml} | 0 playbooks/roles/smbserver/tasks/{main.yml => main.yaml} | 0 playbooks/roles/sshd/handlers/{main.yml => main.yaml} | 0 playbooks/roles/sshd/tasks/{main.yml => main.yaml} | 0 playbooks/roles/sudo/meta/{main.yml => main.yaml} | 0 playbooks/roles/sudo/tasks/{main.yml => main.yaml} | 0 playbooks/roles/wireguard/tasks/{main.yml => main.yaml} | 0 playbooks/run-playbook | 2 +- playbooks/run-roles | 2 +- playbooks/{run-roles.yml => run-roles.yaml} | 0 playbooks/{update-root.yml => update-root.yaml} | 0 83 files changed, 24 insertions(+), 24 deletions(-) rename playbooks/ansible/{cleanup-tmp.yml => cleanup-tmp.yaml} (100%) rename playbooks/ansible/{list-tmp.yml => list-tmp.yaml} (100%) rename playbooks/ansible/{show_facts.yml => show_facts.yaml} (100%) rename playbooks/{cleanup-pip-cache.yml => cleanup-pip-cache.yaml} (100%) rename playbooks/debian/{init-local-phd.yml => init-local-phd.yaml} (100%) rename playbooks/debian/{sa-merge-all.yml => sa-merge-all.yaml} (100%) rename playbooks/debian/{update-all-apt.yml => update-all-apt.yaml} (100%) rename playbooks/fetch-push/{fetch.yml => fetch.yaml} (100%) rename playbooks/fetch-push/{push.yml => push.yaml} (100%) rename playbooks/{init-system.yml => init-system.yaml} (100%) rename playbooks/{init-system2.yml => init-system2.yaml} (100%) rename playbooks/{logcheck.yml => logcheck.yaml} (100%) rename playbooks/redhat/{init-local-phd.yml => init-local-phd.yaml} (100%) rename playbooks/redhat/{update-all-dnf.yml => update-all-dnf.yaml} (100%) rename playbooks/roles/cleanup-pip-cache/tasks/{cleanup-user.yml => cleanup-user.yaml} (100%) rename playbooks/roles/cleanup-pip-cache/tasks/{main.yml => main.yaml} (82%) rename playbooks/roles/cleanup-pip-cache/tasks/{show-user.yml => show-user.yaml} (100%) rename playbooks/roles/debian/add-apache-vhost/handlers/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/add-apache-vhost/meta/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/add-apache-vhost/tasks/{add-vhost.yml => add-vhost.yaml} (100%) rename playbooks/roles/debian/add-apache-vhost/tasks/{dehydrated.yml => dehydrated.yaml} (100%) rename playbooks/roles/debian/add-apache-vhost/tasks/{main.yml => main.yaml} (78%) rename playbooks/roles/debian/add-dns-domain/meta/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/add-dns-domain/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/apache/handlers/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/apache/meta/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/apache/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/dehydrated/meta/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/dehydrated/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/email/handlers/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/email/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/firewall/handlers/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/firewall/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/gitweb/meta/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/gitweb/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/init-logcheck/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/named/meta/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/named/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/debian/remove-systemd/tasks/{main.yml => main.yaml} (91%) rename playbooks/roles/debian/remove-systemd/tasks/{remove-systemd.yml => remove-systemd.yaml} (100%) rename playbooks/roles/debian/security/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/dev-packages/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/docker/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/init-system/tasks/{apt.yml => apt.yaml} (100%) rename playbooks/roles/init-system/tasks/{dnf.yml => dnf.yaml} (100%) rename playbooks/roles/init-system/tasks/{locales.yml => locales.yaml} (100%) rename playbooks/roles/init-system/tasks/{main.yml => main.yaml} (69%) rename playbooks/roles/logcheck/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/mariadb/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/ntpdate-hwc/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/openvpn/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/packages/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/phd/defaults/{main.yml => main.yaml} (100%) rename playbooks/roles/phd/meta/{main.yml => main.yaml} (100%) rename playbooks/roles/phd/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/postgres/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/python-dev-packages/meta/{main.yml => main.yaml} (100%) rename playbooks/roles/python-dev-packages/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/python-packages/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/qemu/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/redhat/firewall/handlers/{main.yml => main.yaml} (100%) rename playbooks/roles/redhat/firewall/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/root/meta/{main.yml => main.yaml} (100%) create mode 100644 playbooks/roles/root/tasks/main.yaml delete mode 100644 playbooks/roles/root/tasks/main.yml rename playbooks/roles/root/tasks/{mc.yml => mc.yaml} (100%) rename playbooks/roles/root/tasks/{root.yml => root.yaml} (100%) rename playbooks/roles/setup-usrlocal/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/smbclient/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/smbserver/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/sshd/handlers/{main.yml => main.yaml} (100%) rename playbooks/roles/sshd/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/sudo/meta/{main.yml => main.yaml} (100%) rename playbooks/roles/sudo/tasks/{main.yml => main.yaml} (100%) rename playbooks/roles/wireguard/tasks/{main.yml => main.yaml} (100%) rename playbooks/{run-roles.yml => run-roles.yaml} (100%) rename playbooks/{update-root.yml => update-root.yaml} (100%) diff --git a/playbooks/ansible/cleanup-tmp.yml b/playbooks/ansible/cleanup-tmp.yaml similarity index 100% rename from playbooks/ansible/cleanup-tmp.yml rename to playbooks/ansible/cleanup-tmp.yaml diff --git a/playbooks/ansible/list-tmp.yml b/playbooks/ansible/list-tmp.yaml similarity index 100% rename from playbooks/ansible/list-tmp.yml rename to playbooks/ansible/list-tmp.yaml diff --git a/playbooks/ansible/show_facts.yml b/playbooks/ansible/show_facts.yaml similarity index 100% rename from playbooks/ansible/show_facts.yml rename to playbooks/ansible/show_facts.yaml diff --git a/playbooks/cleanup-pip-cache.yml b/playbooks/cleanup-pip-cache.yaml similarity index 100% rename from playbooks/cleanup-pip-cache.yml rename to playbooks/cleanup-pip-cache.yaml diff --git a/playbooks/debian/init-local-phd.yml b/playbooks/debian/init-local-phd.yaml similarity index 100% rename from playbooks/debian/init-local-phd.yml rename to playbooks/debian/init-local-phd.yaml diff --git a/playbooks/debian/init-system.sh b/playbooks/debian/init-system.sh index ab4ba71..3a3ef1b 100755 --- a/playbooks/debian/init-system.sh +++ b/playbooks/debian/init-system.sh @@ -15,7 +15,7 @@ ssh phd@$host exit && cd "`dirname \"$0\"`" && # `sudo` isn't configured yet too; use `su` and ask for root password. -ansible-playbook ../init-system.yml "$@" -e hosts="$host" \ +ansible-playbook ../init-system.yaml "$@" -e hosts="$host" \ --become-method=su -K && ../run-roles debian/remove-systemd "$@" -e hosts="$host" && -exec ansible-playbook ../init-system2.yml "$@" -e hosts="$host" +exec ansible-playbook ../init-system2.yaml "$@" -e hosts="$host" diff --git a/playbooks/debian/sa-merge-all.yml b/playbooks/debian/sa-merge-all.yaml similarity index 100% rename from playbooks/debian/sa-merge-all.yml rename to playbooks/debian/sa-merge-all.yaml diff --git a/playbooks/debian/update-all-apt.yml b/playbooks/debian/update-all-apt.yaml similarity index 100% rename from playbooks/debian/update-all-apt.yml rename to playbooks/debian/update-all-apt.yaml diff --git a/playbooks/fetch-push/fetch b/playbooks/fetch-push/fetch index 1a15823..c823cd9 100755 --- a/playbooks/fetch-push/fetch +++ b/playbooks/fetch-push/fetch @@ -2,4 +2,4 @@ start_dir="`pwd`" && fetch_push_dir="`dirname \"$0\"`" && -exec "$HOME"/.virtualenvs/ansible/bin/ansible-playbook -v "$fetch_push_dir"/fetch.yml -e start_dir="$start_dir" "$@" +exec "$HOME"/.virtualenvs/ansible/bin/ansible-playbook -v "$fetch_push_dir"/fetch.yaml -e start_dir="$start_dir" "$@" diff --git a/playbooks/fetch-push/fetch.yml b/playbooks/fetch-push/fetch.yaml similarity index 100% rename from playbooks/fetch-push/fetch.yml rename to playbooks/fetch-push/fetch.yaml diff --git a/playbooks/fetch-push/push b/playbooks/fetch-push/push index 624c755..1953bb8 100755 --- a/playbooks/fetch-push/push +++ b/playbooks/fetch-push/push @@ -2,4 +2,4 @@ start_dir="`pwd`" && fetch_push_dir="`dirname \"$0\"`" && -exec "$HOME"/.virtualenvs/ansible/bin/ansible-playbook -v "$fetch_push_dir"/push.yml -e start_dir="$start_dir" "$@" +exec "$HOME"/.virtualenvs/ansible/bin/ansible-playbook -v "$fetch_push_dir"/push.yaml -e start_dir="$start_dir" "$@" diff --git a/playbooks/fetch-push/push.yml b/playbooks/fetch-push/push.yaml similarity index 100% rename from playbooks/fetch-push/push.yml rename to playbooks/fetch-push/push.yaml diff --git a/playbooks/init-system.yml b/playbooks/init-system.yaml similarity index 100% rename from playbooks/init-system.yml rename to playbooks/init-system.yaml diff --git a/playbooks/init-system2.yml b/playbooks/init-system2.yaml similarity index 100% rename from playbooks/init-system2.yml rename to playbooks/init-system2.yaml diff --git a/playbooks/logcheck.yml b/playbooks/logcheck.yaml similarity index 100% rename from playbooks/logcheck.yml rename to playbooks/logcheck.yaml diff --git a/playbooks/redhat/init-local-phd.yml b/playbooks/redhat/init-local-phd.yaml similarity index 100% rename from playbooks/redhat/init-local-phd.yml rename to playbooks/redhat/init-local-phd.yaml diff --git a/playbooks/redhat/init-system.sh b/playbooks/redhat/init-system.sh index c4423a9..a8901f2 100755 --- a/playbooks/redhat/init-system.sh +++ b/playbooks/redhat/init-system.sh @@ -14,5 +14,5 @@ cd "`dirname \"$0\"`" && # Passwordless access isn't configured yet; use `ssh` connection sharing. # `sudo` isn't configured yet too; ask for phd password. -ansible-playbook ../init-system.yml "$@" -e hosts="$host" -K && -exec ansible-playbook ../init-system2.yml "$@" -e hosts="$host" +ansible-playbook ../init-system.yaml "$@" -e hosts="$host" -K && +exec ansible-playbook ../init-system2.yaml "$@" -e hosts="$host" diff --git a/playbooks/redhat/update-all-dnf.yml b/playbooks/redhat/update-all-dnf.yaml similarity index 100% rename from playbooks/redhat/update-all-dnf.yml rename to playbooks/redhat/update-all-dnf.yaml diff --git a/playbooks/roles/cleanup-pip-cache/tasks/cleanup-user.yml b/playbooks/roles/cleanup-pip-cache/tasks/cleanup-user.yaml similarity index 100% rename from playbooks/roles/cleanup-pip-cache/tasks/cleanup-user.yml rename to playbooks/roles/cleanup-pip-cache/tasks/cleanup-user.yaml diff --git a/playbooks/roles/cleanup-pip-cache/tasks/main.yml b/playbooks/roles/cleanup-pip-cache/tasks/main.yaml similarity index 82% rename from playbooks/roles/cleanup-pip-cache/tasks/main.yml rename to playbooks/roles/cleanup-pip-cache/tasks/main.yaml index 1368f7d..1666509 100644 --- a/playbooks/roles/cleanup-pip-cache/tasks/main.yml +++ b/playbooks/roles/cleanup-pip-cache/tasks/main.yaml @@ -12,26 +12,26 @@ changed_when: false - name: Cleanup ~phd/.cache/pip - import_tasks: cleanup-user.yml + import_tasks: cleanup-user.yaml vars: user: phd when: user_cache_exists.stat.exists - name: du ~phd/.cache/pip - import_tasks: show-user.yml + import_tasks: show-user.yaml vars: user: phd when: user_cache_exists.stat.exists - name: Cleanup ~root/.cache/pip - import_tasks: cleanup-user.yml + import_tasks: cleanup-user.yaml vars: become: true user: root when: root_cache_exists.stat.exists - name: du ~root/.cache/pip - import_tasks: show-user.yml + import_tasks: show-user.yaml vars: user: root when: root_cache_exists.stat.exists diff --git a/playbooks/roles/cleanup-pip-cache/tasks/show-user.yml b/playbooks/roles/cleanup-pip-cache/tasks/show-user.yaml similarity index 100% rename from playbooks/roles/cleanup-pip-cache/tasks/show-user.yml rename to playbooks/roles/cleanup-pip-cache/tasks/show-user.yaml diff --git a/playbooks/roles/debian/add-apache-vhost/handlers/main.yml b/playbooks/roles/debian/add-apache-vhost/handlers/main.yaml similarity index 100% rename from playbooks/roles/debian/add-apache-vhost/handlers/main.yml rename to playbooks/roles/debian/add-apache-vhost/handlers/main.yaml diff --git a/playbooks/roles/debian/add-apache-vhost/meta/main.yml b/playbooks/roles/debian/add-apache-vhost/meta/main.yaml similarity index 100% rename from playbooks/roles/debian/add-apache-vhost/meta/main.yml rename to playbooks/roles/debian/add-apache-vhost/meta/main.yaml diff --git a/playbooks/roles/debian/add-apache-vhost/tasks/add-vhost.yml b/playbooks/roles/debian/add-apache-vhost/tasks/add-vhost.yaml similarity index 100% rename from playbooks/roles/debian/add-apache-vhost/tasks/add-vhost.yml rename to playbooks/roles/debian/add-apache-vhost/tasks/add-vhost.yaml diff --git a/playbooks/roles/debian/add-apache-vhost/tasks/dehydrated.yml b/playbooks/roles/debian/add-apache-vhost/tasks/dehydrated.yaml similarity index 100% rename from playbooks/roles/debian/add-apache-vhost/tasks/dehydrated.yml rename to playbooks/roles/debian/add-apache-vhost/tasks/dehydrated.yaml diff --git a/playbooks/roles/debian/add-apache-vhost/tasks/main.yml b/playbooks/roles/debian/add-apache-vhost/tasks/main.yaml similarity index 78% rename from playbooks/roles/debian/add-apache-vhost/tasks/main.yml rename to playbooks/roles/debian/add-apache-vhost/tasks/main.yaml index 511a676..53baed2 100644 --- a/playbooks/roles/debian/add-apache-vhost/tasks/main.yml +++ b/playbooks/roles/debian/add-apache-vhost/tasks/main.yaml @@ -6,7 +6,7 @@ - block: - name: Add vhost - import_tasks: add-vhost.yml + import_tasks: add-vhost.yaml - name: Run dehydrated for the vhost - import_tasks: dehydrated.yml + import_tasks: dehydrated.yaml when: not vhost_conf.stat.exists diff --git a/playbooks/roles/debian/add-dns-domain/meta/main.yml b/playbooks/roles/debian/add-dns-domain/meta/main.yaml similarity index 100% rename from playbooks/roles/debian/add-dns-domain/meta/main.yml rename to playbooks/roles/debian/add-dns-domain/meta/main.yaml diff --git a/playbooks/roles/debian/add-dns-domain/tasks/main.yml b/playbooks/roles/debian/add-dns-domain/tasks/main.yaml similarity index 100% rename from playbooks/roles/debian/add-dns-domain/tasks/main.yml rename to playbooks/roles/debian/add-dns-domain/tasks/main.yaml diff --git a/playbooks/roles/debian/apache/handlers/main.yml b/playbooks/roles/debian/apache/handlers/main.yaml similarity index 100% rename from playbooks/roles/debian/apache/handlers/main.yml rename to playbooks/roles/debian/apache/handlers/main.yaml diff --git a/playbooks/roles/debian/apache/meta/main.yml b/playbooks/roles/debian/apache/meta/main.yaml similarity index 100% rename from playbooks/roles/debian/apache/meta/main.yml rename to playbooks/roles/debian/apache/meta/main.yaml diff --git a/playbooks/roles/debian/apache/tasks/main.yml b/playbooks/roles/debian/apache/tasks/main.yaml similarity index 100% rename from playbooks/roles/debian/apache/tasks/main.yml rename to playbooks/roles/debian/apache/tasks/main.yaml diff --git a/playbooks/roles/debian/dehydrated/meta/main.yml b/playbooks/roles/debian/dehydrated/meta/main.yaml similarity index 100% rename from playbooks/roles/debian/dehydrated/meta/main.yml rename to playbooks/roles/debian/dehydrated/meta/main.yaml diff --git a/playbooks/roles/debian/dehydrated/tasks/main.yml b/playbooks/roles/debian/dehydrated/tasks/main.yaml similarity index 100% rename from playbooks/roles/debian/dehydrated/tasks/main.yml rename to playbooks/roles/debian/dehydrated/tasks/main.yaml diff --git a/playbooks/roles/debian/email/handlers/main.yml b/playbooks/roles/debian/email/handlers/main.yaml similarity index 100% rename from playbooks/roles/debian/email/handlers/main.yml rename to playbooks/roles/debian/email/handlers/main.yaml diff --git a/playbooks/roles/debian/email/tasks/main.yml b/playbooks/roles/debian/email/tasks/main.yaml similarity index 100% rename from playbooks/roles/debian/email/tasks/main.yml rename to playbooks/roles/debian/email/tasks/main.yaml diff --git a/playbooks/roles/debian/firewall/handlers/main.yml b/playbooks/roles/debian/firewall/handlers/main.yaml similarity index 100% rename from playbooks/roles/debian/firewall/handlers/main.yml rename to playbooks/roles/debian/firewall/handlers/main.yaml diff --git a/playbooks/roles/debian/firewall/tasks/main.yml b/playbooks/roles/debian/firewall/tasks/main.yaml similarity index 100% rename from playbooks/roles/debian/firewall/tasks/main.yml rename to playbooks/roles/debian/firewall/tasks/main.yaml diff --git a/playbooks/roles/debian/gitweb/meta/main.yml b/playbooks/roles/debian/gitweb/meta/main.yaml similarity index 100% rename from playbooks/roles/debian/gitweb/meta/main.yml rename to playbooks/roles/debian/gitweb/meta/main.yaml diff --git a/playbooks/roles/debian/gitweb/tasks/main.yml b/playbooks/roles/debian/gitweb/tasks/main.yaml similarity index 100% rename from playbooks/roles/debian/gitweb/tasks/main.yml rename to playbooks/roles/debian/gitweb/tasks/main.yaml diff --git a/playbooks/roles/debian/init-logcheck/tasks/main.yml b/playbooks/roles/debian/init-logcheck/tasks/main.yaml similarity index 100% rename from playbooks/roles/debian/init-logcheck/tasks/main.yml rename to playbooks/roles/debian/init-logcheck/tasks/main.yaml diff --git a/playbooks/roles/debian/named/meta/main.yml b/playbooks/roles/debian/named/meta/main.yaml similarity index 100% rename from playbooks/roles/debian/named/meta/main.yml rename to playbooks/roles/debian/named/meta/main.yaml diff --git a/playbooks/roles/debian/named/tasks/main.yml b/playbooks/roles/debian/named/tasks/main.yaml similarity index 100% rename from playbooks/roles/debian/named/tasks/main.yml rename to playbooks/roles/debian/named/tasks/main.yaml diff --git a/playbooks/roles/debian/remove-systemd/tasks/main.yml b/playbooks/roles/debian/remove-systemd/tasks/main.yaml similarity index 91% rename from playbooks/roles/debian/remove-systemd/tasks/main.yml rename to playbooks/roles/debian/remove-systemd/tasks/main.yaml index d8df259..f463ca3 100644 --- a/playbooks/roles/debian/remove-systemd/tasks/main.yml +++ b/playbooks/roles/debian/remove-systemd/tasks/main.yaml @@ -32,12 +32,12 @@ force: no - name: Purge SystemD - import_tasks: remove-systemd.yml + import_tasks: remove-systemd.yaml - block: - name: Reboot if SystemD is still active become: true reboot: - name: Purge SystemD after reboot - import_tasks: remove-systemd.yml + import_tasks: remove-systemd.yaml when: "'rc' in purged and purged.rc != 0" diff --git a/playbooks/roles/debian/remove-systemd/tasks/remove-systemd.yml b/playbooks/roles/debian/remove-systemd/tasks/remove-systemd.yaml similarity index 100% rename from playbooks/roles/debian/remove-systemd/tasks/remove-systemd.yml rename to playbooks/roles/debian/remove-systemd/tasks/remove-systemd.yaml diff --git a/playbooks/roles/debian/security/tasks/main.yml b/playbooks/roles/debian/security/tasks/main.yaml similarity index 100% rename from playbooks/roles/debian/security/tasks/main.yml rename to playbooks/roles/debian/security/tasks/main.yaml diff --git a/playbooks/roles/dev-packages/tasks/main.yml b/playbooks/roles/dev-packages/tasks/main.yaml similarity index 100% rename from playbooks/roles/dev-packages/tasks/main.yml rename to playbooks/roles/dev-packages/tasks/main.yaml diff --git a/playbooks/roles/docker/tasks/main.yml b/playbooks/roles/docker/tasks/main.yaml similarity index 100% rename from playbooks/roles/docker/tasks/main.yml rename to playbooks/roles/docker/tasks/main.yaml diff --git a/playbooks/roles/init-system/tasks/apt.yml b/playbooks/roles/init-system/tasks/apt.yaml similarity index 100% rename from playbooks/roles/init-system/tasks/apt.yml rename to playbooks/roles/init-system/tasks/apt.yaml diff --git a/playbooks/roles/init-system/tasks/dnf.yml b/playbooks/roles/init-system/tasks/dnf.yaml similarity index 100% rename from playbooks/roles/init-system/tasks/dnf.yml rename to playbooks/roles/init-system/tasks/dnf.yaml diff --git a/playbooks/roles/init-system/tasks/locales.yml b/playbooks/roles/init-system/tasks/locales.yaml similarity index 100% rename from playbooks/roles/init-system/tasks/locales.yml rename to playbooks/roles/init-system/tasks/locales.yaml diff --git a/playbooks/roles/init-system/tasks/main.yml b/playbooks/roles/init-system/tasks/main.yaml similarity index 69% rename from playbooks/roles/init-system/tasks/main.yml rename to playbooks/roles/init-system/tasks/main.yaml index dccb754..262121b 100644 --- a/playbooks/roles/init-system/tasks/main.yml +++ b/playbooks/roles/init-system/tasks/main.yaml @@ -1,11 +1,11 @@ - name: apt - import_tasks: apt.yml + import_tasks: apt.yaml when: ansible_facts.os_family == 'Debian' - name: locales - import_tasks: locales.yml + import_tasks: locales.yaml when: ansible_facts.os_family == 'Debian' - name: packages - import_tasks: dnf.yml + import_tasks: dnf.yaml when: ansible_facts.os_family == 'RedHat' diff --git a/playbooks/roles/logcheck/tasks/main.yml b/playbooks/roles/logcheck/tasks/main.yaml similarity index 100% rename from playbooks/roles/logcheck/tasks/main.yml rename to playbooks/roles/logcheck/tasks/main.yaml diff --git a/playbooks/roles/mariadb/tasks/main.yml b/playbooks/roles/mariadb/tasks/main.yaml similarity index 100% rename from playbooks/roles/mariadb/tasks/main.yml rename to playbooks/roles/mariadb/tasks/main.yaml diff --git a/playbooks/roles/ntpdate-hwc/tasks/main.yml b/playbooks/roles/ntpdate-hwc/tasks/main.yaml similarity index 100% rename from playbooks/roles/ntpdate-hwc/tasks/main.yml rename to playbooks/roles/ntpdate-hwc/tasks/main.yaml diff --git a/playbooks/roles/openvpn/tasks/main.yml b/playbooks/roles/openvpn/tasks/main.yaml similarity index 100% rename from playbooks/roles/openvpn/tasks/main.yml rename to playbooks/roles/openvpn/tasks/main.yaml diff --git a/playbooks/roles/packages/tasks/main.yml b/playbooks/roles/packages/tasks/main.yaml similarity index 100% rename from playbooks/roles/packages/tasks/main.yml rename to playbooks/roles/packages/tasks/main.yaml diff --git a/playbooks/roles/phd/defaults/main.yml b/playbooks/roles/phd/defaults/main.yaml similarity index 100% rename from playbooks/roles/phd/defaults/main.yml rename to playbooks/roles/phd/defaults/main.yaml diff --git a/playbooks/roles/phd/meta/main.yml b/playbooks/roles/phd/meta/main.yaml similarity index 100% rename from playbooks/roles/phd/meta/main.yml rename to playbooks/roles/phd/meta/main.yaml diff --git a/playbooks/roles/phd/tasks/main.yml b/playbooks/roles/phd/tasks/main.yaml similarity index 100% rename from playbooks/roles/phd/tasks/main.yml rename to playbooks/roles/phd/tasks/main.yaml diff --git a/playbooks/roles/postgres/tasks/main.yml b/playbooks/roles/postgres/tasks/main.yaml similarity index 100% rename from playbooks/roles/postgres/tasks/main.yml rename to playbooks/roles/postgres/tasks/main.yaml diff --git a/playbooks/roles/python-dev-packages/meta/main.yml b/playbooks/roles/python-dev-packages/meta/main.yaml similarity index 100% rename from playbooks/roles/python-dev-packages/meta/main.yml rename to playbooks/roles/python-dev-packages/meta/main.yaml diff --git a/playbooks/roles/python-dev-packages/tasks/main.yml b/playbooks/roles/python-dev-packages/tasks/main.yaml similarity index 100% rename from playbooks/roles/python-dev-packages/tasks/main.yml rename to playbooks/roles/python-dev-packages/tasks/main.yaml diff --git a/playbooks/roles/python-packages/tasks/main.yml b/playbooks/roles/python-packages/tasks/main.yaml similarity index 100% rename from playbooks/roles/python-packages/tasks/main.yml rename to playbooks/roles/python-packages/tasks/main.yaml diff --git a/playbooks/roles/qemu/tasks/main.yml b/playbooks/roles/qemu/tasks/main.yaml similarity index 100% rename from playbooks/roles/qemu/tasks/main.yml rename to playbooks/roles/qemu/tasks/main.yaml diff --git a/playbooks/roles/redhat/firewall/handlers/main.yml b/playbooks/roles/redhat/firewall/handlers/main.yaml similarity index 100% rename from playbooks/roles/redhat/firewall/handlers/main.yml rename to playbooks/roles/redhat/firewall/handlers/main.yaml diff --git a/playbooks/roles/redhat/firewall/tasks/main.yml b/playbooks/roles/redhat/firewall/tasks/main.yaml similarity index 100% rename from playbooks/roles/redhat/firewall/tasks/main.yml rename to playbooks/roles/redhat/firewall/tasks/main.yaml diff --git a/playbooks/roles/root/meta/main.yml b/playbooks/roles/root/meta/main.yaml similarity index 100% rename from playbooks/roles/root/meta/main.yml rename to playbooks/roles/root/meta/main.yaml diff --git a/playbooks/roles/root/tasks/main.yaml b/playbooks/roles/root/tasks/main.yaml new file mode 100644 index 0000000..145325a --- /dev/null +++ b/playbooks/roles/root/tasks/main.yaml @@ -0,0 +1,5 @@ +- name: root + import_tasks: root.yaml + +- name: mc + import_tasks: mc.yaml diff --git a/playbooks/roles/root/tasks/main.yml b/playbooks/roles/root/tasks/main.yml deleted file mode 100644 index 9654fa7..0000000 --- a/playbooks/roles/root/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: root - import_tasks: root.yml - -- name: mc - import_tasks: mc.yml diff --git a/playbooks/roles/root/tasks/mc.yml b/playbooks/roles/root/tasks/mc.yaml similarity index 100% rename from playbooks/roles/root/tasks/mc.yml rename to playbooks/roles/root/tasks/mc.yaml diff --git a/playbooks/roles/root/tasks/root.yml b/playbooks/roles/root/tasks/root.yaml similarity index 100% rename from playbooks/roles/root/tasks/root.yml rename to playbooks/roles/root/tasks/root.yaml diff --git a/playbooks/roles/setup-usrlocal/tasks/main.yml b/playbooks/roles/setup-usrlocal/tasks/main.yaml similarity index 100% rename from playbooks/roles/setup-usrlocal/tasks/main.yml rename to playbooks/roles/setup-usrlocal/tasks/main.yaml diff --git a/playbooks/roles/smbclient/tasks/main.yml b/playbooks/roles/smbclient/tasks/main.yaml similarity index 100% rename from playbooks/roles/smbclient/tasks/main.yml rename to playbooks/roles/smbclient/tasks/main.yaml diff --git a/playbooks/roles/smbserver/tasks/main.yml b/playbooks/roles/smbserver/tasks/main.yaml similarity index 100% rename from playbooks/roles/smbserver/tasks/main.yml rename to playbooks/roles/smbserver/tasks/main.yaml diff --git a/playbooks/roles/sshd/handlers/main.yml b/playbooks/roles/sshd/handlers/main.yaml similarity index 100% rename from playbooks/roles/sshd/handlers/main.yml rename to playbooks/roles/sshd/handlers/main.yaml diff --git a/playbooks/roles/sshd/tasks/main.yml b/playbooks/roles/sshd/tasks/main.yaml similarity index 100% rename from playbooks/roles/sshd/tasks/main.yml rename to playbooks/roles/sshd/tasks/main.yaml diff --git a/playbooks/roles/sudo/meta/main.yml b/playbooks/roles/sudo/meta/main.yaml similarity index 100% rename from playbooks/roles/sudo/meta/main.yml rename to playbooks/roles/sudo/meta/main.yaml diff --git a/playbooks/roles/sudo/tasks/main.yml b/playbooks/roles/sudo/tasks/main.yaml similarity index 100% rename from playbooks/roles/sudo/tasks/main.yml rename to playbooks/roles/sudo/tasks/main.yaml diff --git a/playbooks/roles/wireguard/tasks/main.yml b/playbooks/roles/wireguard/tasks/main.yaml similarity index 100% rename from playbooks/roles/wireguard/tasks/main.yml rename to playbooks/roles/wireguard/tasks/main.yaml diff --git a/playbooks/run-playbook b/playbooks/run-playbook index b77bdd5..00658a3 100755 --- a/playbooks/run-playbook +++ b/playbooks/run-playbook @@ -1,7 +1,7 @@ #! /bin/sh if [ -z "$1" ]; then - echo "Usage: $0 playbook.yml [...params...]" >&2 + echo "Usage: $0 playbook.yaml [...params...]" >&2 exit 1 fi diff --git a/playbooks/run-roles b/playbooks/run-roles index 4251ac1..c752b9b 100755 --- a/playbooks/run-roles +++ b/playbooks/run-roles @@ -9,4 +9,4 @@ roles="$1" shift cd "`dirname \"$0\"`" && -exec ansible-playbook run-roles.yml "$@" -e roles="$roles" +exec ansible-playbook run-roles.yaml "$@" -e roles="$roles" diff --git a/playbooks/run-roles.yml b/playbooks/run-roles.yaml similarity index 100% rename from playbooks/run-roles.yml rename to playbooks/run-roles.yaml diff --git a/playbooks/update-root.yml b/playbooks/update-root.yaml similarity index 100% rename from playbooks/update-root.yml rename to playbooks/update-root.yaml -- 2.39.5