From 4ac6e2548e9779570777a71d0516abf3516d2436 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Wed, 5 Dec 2018 16:34:07 -0500 Subject: Clean the playbook a bit --- playbooks/osci.theopensourceway.org.yml | 3 ++- roles/old_wiki/tasks/main.yml | 4 +++- 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 -- cgit