From c9178ee72fb416c4e975f55ead4a524bba259661 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 28 Sep 2017 19:14:54 -0500 Subject: [PATCH 1/2] add home-page as a tag --- roles/httpd/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 9cd6e108c..e3e91970a 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -147,6 +147,9 @@ - base - include: home-page.yml + tags: + - base + - home-page - name: place the script to generate home pages template: src=refresh-wiki-docs.sh From 658fd199d18cec38a8d03ddf8561b5cfcd7ef697 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 5 Oct 2017 13:15:51 -0500 Subject: [PATCH 2/2] move home-page so admin-console can modify the setting --- roles/4-server-options/meta/main.yml | 1 + .../{httpd/tasks/home-page.yml => home-page/tasks/main.yml} | 2 +- roles/{httpd => home-page}/templates/iiab-home-page.conf | 0 roles/httpd/tasks/main.yml | 5 ----- 4 files changed, 2 insertions(+), 6 deletions(-) rename roles/{httpd/tasks/home-page.yml => home-page/tasks/main.yml} (86%) rename roles/{httpd => home-page}/templates/iiab-home-page.conf (100%) diff --git a/roles/4-server-options/meta/main.yml b/roles/4-server-options/meta/main.yml index 73438a60f..7aec1a69c 100644 --- a/roles/4-server-options/meta/main.yml +++ b/roles/4-server-options/meta/main.yml @@ -1,4 +1,5 @@ dependencies: + - { role: home-page, tags: ['home-page'] } - { role: sshd, tags: ['services','sshd','base'] } - { role: network, tags: ['services','base','network'] } - { role: postgresql, tags: ['services','postgresql','base'], when: postgresql_install } diff --git a/roles/httpd/tasks/home-page.yml b/roles/home-page/tasks/main.yml similarity index 86% rename from roles/httpd/tasks/home-page.yml rename to roles/home-page/tasks/main.yml index 522f97fe2..b5d57c82a 100644 --- a/roles/httpd/tasks/home-page.yml +++ b/roles/home-page/tasks/main.yml @@ -7,7 +7,7 @@ - name: Install admin home page into apache2 template: src=iiab-home-page.conf - dest=/etc/{{ apache_config_dir }}/iiab-home-page.conf + dest=/etc/{{ apache_config_dir }}/iiab-home-page.conf - name: Enable the home page file: src=/etc/{{ apache_config_dir }}/iiab-home-page.conf diff --git a/roles/httpd/templates/iiab-home-page.conf b/roles/home-page/templates/iiab-home-page.conf similarity index 100% rename from roles/httpd/templates/iiab-home-page.conf rename to roles/home-page/templates/iiab-home-page.conf diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index e3e91970a..7f2a2c3cf 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -146,11 +146,6 @@ tags: - base -- include: home-page.yml - tags: - - base - - home-page - - name: place the script to generate home pages template: src=refresh-wiki-docs.sh dest=/usr/bin/iiab-refresh-wiki-docs