Repository: airavata Updated Branches: refs/heads/master 10d7c029a -> b6fb0b98d
Fixed bug with copying default.conf virtual host Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b6fb0b98 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b6fb0b98 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b6fb0b98 Branch: refs/heads/master Commit: b6fb0b98d146951df5caa975b6d641a0b90fa7ef Parents: 10d7c02 Author: Marcus Christie <[email protected]> Authored: Fri Apr 28 11:35:45 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Fri Apr 28 11:35:45 2017 -0400 ---------------------------------------------------------------------- dev-tools/ansible/roles/pga/defaults/main.yml | 3 +++ dev-tools/ansible/roles/pga/tasks/main.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b6fb0b98/dev-tools/ansible/roles/pga/defaults/main.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml index a36593c..a7e7934 100644 --- a/dev-tools/ansible/roles/pga/defaults/main.yml +++ b/dev-tools/ansible/roles/pga/defaults/main.yml @@ -26,6 +26,9 @@ vhost_ssl: False httpd_confd_file_location: RedHat: "/etc/httpd/conf.d/pga-{{ gateway_id }}.conf" Debian: "/etc/apache2/sites-available/pga-{{ gateway_id }}.conf" +default_conf_file_location: + RedHat: "/etc/httpd/conf.d/default.conf" + Debian: "/etc/apache2/sites-available/default.conf" httpd_name: Debian: apache2 RedHat: httpd http://git-wip-us.apache.org/repos/asf/airavata/blob/b6fb0b98/dev-tools/ansible/roles/pga/tasks/main.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml index 9e9cb74..36ad77c 100644 --- a/dev-tools/ansible/roles/pga/tasks/main.yml +++ b/dev-tools/ansible/roles/pga/tasks/main.yml @@ -141,7 +141,7 @@ when: vhost_ssl - name: copy default virtual host file - copy: src=default.conf dest={{ httpd_confd_file_location[ansible_os_family] }} backup=yes + copy: src=default.conf dest={{ default_conf_file_location[ansible_os_family] }} backup=yes become: yes notify: - restart httpd
