From 92c8c7fac96ee136015c6522258007aa92c03288 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Thu, 29 Aug 2019 18:29:31 +0300 Subject: [PATCH] Rename playbooks: debian-* -> debian/* --- .../{debian-add-apache-vhost => debian/add-apache-vhost} | 4 ++-- playbooks/{debian-add-dns-domain => debian/add-dns-domain} | 4 ++-- playbooks/{debian-init-system.sh => debian/init-system.sh} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename playbooks/{debian-add-apache-vhost => debian/add-apache-vhost} (63%) rename playbooks/{debian-add-dns-domain => debian/add-dns-domain} (65%) rename playbooks/{debian-init-system.sh => debian/init-system.sh} (69%) diff --git a/playbooks/debian-add-apache-vhost b/playbooks/debian/add-apache-vhost similarity index 63% rename from playbooks/debian-add-apache-vhost rename to playbooks/debian/add-apache-vhost index a492090..514c86b 100755 --- a/playbooks/debian-add-apache-vhost +++ b/playbooks/debian/add-apache-vhost @@ -10,5 +10,5 @@ shift cd "`dirname \"$0\"`" && ANSIBLE_ROLES_PATH=debian/roles \ - exec ./run-role add-apache-vhost "$@" \ - -e virtual_host="$vhost" -e gather_facts=true + exec ../run-role add-apache-vhost "$@" \ + -e virtual_host="$vhost" -e gather_facts=true diff --git a/playbooks/debian-add-dns-domain b/playbooks/debian/add-dns-domain similarity index 65% rename from playbooks/debian-add-dns-domain rename to playbooks/debian/add-dns-domain index 0e2222b..38c14b5 100755 --- a/playbooks/debian-add-dns-domain +++ b/playbooks/debian/add-dns-domain @@ -10,5 +10,5 @@ shift cd "`dirname \"$0\"`" && ANSIBLE_ROLES_PATH=debian/roles \ - exec ./run-role add-dns-domain "$@" \ - -e domain="$domain" -e gather_facts=true + exec ../run-role add-dns-domain "$@" \ + -e domain="$domain" -e gather_facts=true diff --git a/playbooks/debian-init-system.sh b/playbooks/debian/init-system.sh similarity index 69% rename from playbooks/debian-init-system.sh rename to playbooks/debian/init-system.sh index b55955d..2363c80 100755 --- a/playbooks/debian-init-system.sh +++ b/playbooks/debian/init-system.sh @@ -12,6 +12,6 @@ cd "`dirname \"$0\"`" && # Passwordless access isn't configured yet; use `ssh` connection sharing. # `sudo` isn't configured yet too; use `su` and ask for root password. -ansible-playbook debian/init-system.yml "$@" -e hosts="$host" \ +ansible-playbook init-system.yml "$@" -e hosts="$host" \ --become-method=su -K && -exec ansible-playbook debian/init-system2.yml "$@" -e hosts="$host" +exec ansible-playbook init-system2.yml "$@" -e hosts="$host" -- 2.39.2