airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [3/5] airavata git commit: Fixed bug with copying default.conf virtual host
Date Tue, 02 May 2017 18:07:55 GMT
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/7699ea08
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7699ea08
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7699ea08

Branch: refs/heads/develop
Commit: 7699ea0818291497542a3b8abb1ed5cd0057201d
Parents: 54e640c
Author: Marcus Christie <machristie@apache.org>
Authored: Fri Apr 28 11:35:45 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Tue May 2 14:04:08 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/7699ea08/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/7699ea08/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


Mime
View raw message