This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 5bb160fe205827b116cda59cc24653e8f9174048 Author: Marcus Christie <[email protected]> AuthorDate: Fri Jan 31 16:21:36 2020 -0500 Ansible: adding missing httpd_name mapping --- dev-tools/ansible/roles/httpd/defaults/main.yml | 3 +++ dev-tools/ansible/roles/httpd/handlers/main.yml | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-tools/ansible/roles/httpd/defaults/main.yml b/dev-tools/ansible/roles/httpd/defaults/main.yml index 4eb89db..65023f6 100644 --- a/dev-tools/ansible/roles/httpd/defaults/main.yml +++ b/dev-tools/ansible/roles/httpd/defaults/main.yml @@ -30,6 +30,9 @@ httpd_ssl_conf_file_location: RedHat: "/etc/httpd/conf.d/ssl.conf" # TODO: Debian file layout is different, so we really need a different ssl.conf for Debian Debian: "/etc/apache2/mods-available/ssl.conf" +httpd_name: + Debian: apache2 + RedHat: httpd httpd_default_conf_template: "default.conf.j2" httpd_ssl_conf_template: "ssl.conf.j2" diff --git a/dev-tools/ansible/roles/httpd/handlers/main.yml b/dev-tools/ansible/roles/httpd/handlers/main.yml index dec326a..e5bfb0a 100644 --- a/dev-tools/ansible/roles/httpd/handlers/main.yml +++ b/dev-tools/ansible/roles/httpd/handlers/main.yml @@ -24,5 +24,3 @@ - name: restart httpd service: name={{ httpd_name[ansible_os_family] }} state=reloaded enabled=yes become: yes - -#{{ httpd_name[ansible_os_family] }} \ No newline at end of file
