commit 80e90921a5d93dc5d99fc8d647c86bf79f1a344e Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Wed Aug 18 21:35:36 2021 +0200 Update include playbooks/include/happy_birthday.yml | 1 + playbooks/include/proxies-certificates.yml | 4 ++-- playbooks/include/proxies-fedora-web.yml | 2 +- playbooks/include/proxies-haproxy.yml | 2 +- playbooks/include/proxies-redirects.yml | 2 +- playbooks/include/proxies-reverseproxy.yml | 2 +- playbooks/include/proxies-rewrites.yml | 2 +- playbooks/include/proxies-websites.yml | 12 +++--------- 8 files changed, 11 insertions(+), 16 deletions(-) --- diff --git a/playbooks/include/happy_birthday.yml b/playbooks/include/happy_birthday.yml index f9ba7e6..6d7a41c 100644 --- a/playbooks/include/happy_birthday.yml +++ b/playbooks/include/happy_birthday.yml @@ -9,6 +9,7 @@ tasks: - import_tasks: "{{ tasks_path }}/happy_birthday.yml" + - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml index 8ecea0f..2f044e1 100644 --- a/playbooks/include/proxies-certificates.yml +++ b/playbooks/include/proxies-certificates.yml @@ -1,5 +1,5 @@ - name: Set up those proxy certificates. Good gravy.. - hosts: proxies-stg:proxies + hosts: proxies_stg:proxies user: root gather_facts: True @@ -14,7 +14,7 @@ roles: - role: httpd/mod_ssl - + - role: httpd/certificate name: wildcard-2016.rpmfusion.org SSLCertificateChainFile: wildcard-2016.rpmfusion.org.intermediate.cert diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index b59fb00..9fdee72 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -1,5 +1,5 @@ - name: Set up all that fedora-web goodness. What a wonder! - hosts: proxies-stg:proxies + hosts: proxies_stg:proxies user: root gather_facts: True diff --git a/playbooks/include/proxies-haproxy.yml b/playbooks/include/proxies-haproxy.yml index 1158351..941e5af 100644 --- a/playbooks/include/proxies-haproxy.yml +++ b/playbooks/include/proxies-haproxy.yml @@ -1,5 +1,5 @@ - name: Set up all the haproxy stuff. - hosts: proxies-stg:proxies + hosts: proxies_stg:proxies user: root gather_facts: True diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index 9638be2..1cadeb1 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -1,5 +1,5 @@ - name: Set up those proxy redirects. Wow! - hosts: proxies-stg:proxies + hosts: proxies_stg:proxies user: root gather_facts: True diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index c8d5239..0de8451 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -1,5 +1,5 @@ - name: Set up those ProxyPassReverse statements. Somebody get me a cup of coffee.. - hosts: proxies-stg:proxies + hosts: proxies_stg:proxies user: root gather_facts: True diff --git a/playbooks/include/proxies-rewrites.yml b/playbooks/include/proxies-rewrites.yml index 78b1109..30e9dd4 100644 --- a/playbooks/include/proxies-rewrites.yml +++ b/playbooks/include/proxies-rewrites.yml @@ -1,5 +1,5 @@ - name: Set up some domain rewrites. - hosts: proxies-stg:proxies + hosts: proxies_stg:proxies user: root gather_facts: True diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 2d9e52b..a5e0a29 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -1,5 +1,5 @@ - name: Set up those proxy websites. My, my.. - hosts: proxies-stg:proxies + hosts: proxies_stg:proxies user: root gather_facts: True @@ -11,15 +11,9 @@ handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" - - pre_tasks: - - name: Install policycoreutils-python - package: name=policycoreutils-python state=present - + tasks: - name: Create /srv/web/ for all the goodies. - file: > - dest=/srv/web state=directory - owner=root group=root mode=0755 + file: dest=/srv/web state=directory owner=root group=root mode=0755 tags: - httpd - httpd/website