summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@redhat.com>2018-12-05 16:34:07 -0500
committerMichael Scherer <misc@redhat.com>2018-12-05 16:34:07 -0500
commit4ac6e2548e9779570777a71d0516abf3516d2436 (patch)
tree5ba4f282145498b1511d1db70c4503b997acc0d8
parent55502d80bb5d120bc9862f9c147b42ba03c7a134 (diff)
Clean the playbook a bit
-rw-r--r--playbooks/osci.theopensourceway.org.yml3
-rw-r--r--roles/old_wiki/tasks/main.yml4
2 files changed, 5 insertions, 2 deletions
diff --git a/playbooks/osci.theopensourceway.org.yml b/playbooks/osci.theopensourceway.org.yml
index b2f7200..a906e7a 100644
--- a/playbooks/osci.theopensourceway.org.yml
+++ b/playbooks/osci.theopensourceway.org.yml
@@ -20,9 +20,10 @@
- role: httpd
website_domain: theopensourceway.org
redirect: http://www.theopensourceway.org/
+
- role: old_wiki
old_wiki_dir: /var/www/old_server/wiki/
- website_url: www.theopensourceway.org
+ website_domain: www.theopensourceway.org
- deploy_website
- mailman_lists
- cgit
diff --git a/roles/old_wiki/tasks/main.yml b/roles/old_wiki/tasks/main.yml
index bef5cff..4ce26be 100644
--- a/roles/old_wiki/tasks/main.yml
+++ b/roles/old_wiki/tasks/main.yml
@@ -1,3 +1,5 @@
---
-- template: src=oldwiki.conf dest=/etc/httpd/conf.d/{{ website_url }}.conf.d/oldwiki.conf
+- template:
+ src: oldwiki.conf
+ dest: /etc/httpd/conf.d/{{ website_domain }}.conf.d/oldwiki.conf
notify: restart httpd