Merge pull request #26 from FlxPeters/master

Fixes #25: Fails to get installed version of Apache.
This commit is contained in:
Jeff Geerling 2015-07-23 11:55:47 -05:00
commit dc89c2b987
3 changed files with 3 additions and 1 deletions

View file

@ -17,7 +17,7 @@
# Figure out what version of Apache is installed. # Figure out what version of Apache is installed.
- name: Get installed version of Apache. - name: Get installed version of Apache.
command: "{{ apache_daemon }} -v" shell: "{{apache_daemon_path}}{{ apache_daemon }} -v"
changed_when: false changed_when: false
always_run: yes always_run: yes
register: _apache_version register: _apache_version

View file

@ -1,5 +1,6 @@
--- ---
apache_daemon: apache2 apache_daemon: apache2
apache_daemon_path: /usr/sbin/
apache_server_root: /etc/apache2 apache_server_root: /etc/apache2
apache_conf_path: /etc/apache2 apache_conf_path: /etc/apache2

View file

@ -1,5 +1,6 @@
--- ---
apache_daemon: httpd apache_daemon: httpd
apache_daemon_path: /usr/sbin/
apache_server_root: /etc/httpd apache_server_root: /etc/httpd
apache_conf_path: /etc/httpd/conf.d apache_conf_path: /etc/httpd/conf.d