libretic/ansible-role-apache
6
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-apache synced 2024-11-10 07:53:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #107 from stevenspasbo/master

Browse source 
Removed duplication in tasks
This commit is contained in:
Jeff Geerling 2016-10-11 21:29:46 -05:00 committed by GitHub
commit c1ba6af389
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tasks/main.yml
View file

@ -9,17 +9,7 @@
when: apache_packages is not defined when: apache_packages is not defined
# Setup/install tasks. # Setup/install tasks.
- include: setup-RedHat.yml - include: "setup-{{ ansible_os_family }}.yml"
when: ansible_os_family == 'RedHat'
- include: setup-Suse.yml
when: ansible_os_family == 'Suse'
- include: setup-Debian.yml
when: ansible_os_family == 'Debian'
- include: setup-Solaris.yml
when: ansible_os_family == 'Solaris'
# 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.
@ -39,17 +29,7 @@
when: "apache_version.split('.')[1] == '4'" when: "apache_version.split('.')[1] == '4'"
# Configure Apache. # Configure Apache.
- include: configure-RedHat.yml - include: "configure-{{ ansible_os_family }}.yml"
when: ansible_os_family == 'RedHat'
- include: configure-Suse.yml
when: ansible_os_family == 'Suse'
- include: configure-Debian.yml
when: ansible_os_family == 'Debian'
- include: configure-Solaris.yml
when: ansible_os_family == 'Solaris'
- name: Ensure Apache has selected state and enabled on boot. - name: Ensure Apache has selected state and enabled on boot.
service: service: