Merge branch 'jansepke-patch-1'

This commit is contained in:
Jeff Geerling 2018-04-04 14:13:04 -05:00
commit c8c80dd3ac
4 changed files with 7 additions and 9 deletions

View file

@ -100,7 +100,7 @@ The list of packages to be installed. This defaults to a set of platform-specifi
Set initial Apache daemon state to be enforced when this role is run. This should generally remain `started`, but you can set it to `stopped` if you need to fix the Apache config during a playbook run or otherwise would not like Apache started at the time this role is run. Set initial Apache daemon state to be enforced when this role is run. This should generally remain `started`, but you can set it to `stopped` if you need to fix the Apache config during a playbook run or otherwise would not like Apache started at the time this role is run.
apache_packages_state: installed apache_packages_state: present
If you have enabled any additional repositories such as _ondrej/apache2_, [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel), or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to upgrade versions. You can set this to `latest` (combined with `apache_enablerepo` on RHEL) and can directly upgrade to a different Apache version from a different repo (instead of uninstalling and reinstalling Apache). If you have enabled any additional repositories such as _ondrej/apache2_, [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel), or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to upgrade versions. You can set this to `latest` (combined with `apache_enablerepo` on RHEL) and can directly upgrade to a different Apache version from a different repo (instead of uninstalling and reinstalling Apache).

View file

@ -53,6 +53,6 @@ apache_state: started
# `restarted` or `reloaded` # `restarted` or `reloaded`
apache_restart_state: restarted apache_restart_state: restarted
# Apache package state; use `installed` to make sure it's installed, or `latest` if # Apache package state; use `present` to make sure it's installed, or `latest`
# you want to upgrade or switch versions using a new repo. # if you want to upgrade or switch versions using a new repo.
apache_packages_state: installed apache_packages_state: present

View file

@ -6,7 +6,7 @@ galaxy_info:
description: Apache 2.x for Linux. description: Apache 2.x for Linux.
company: "Midwestern Mac, LLC" company: "Midwestern Mac, LLC"
license: "license (BSD, MIT)" license: "license (BSD, MIT)"
min_ansible_version: 2.2 min_ansible_version: 2.4
platforms: platforms:
- name: EL - name: EL
versions: versions:

View file

@ -13,8 +13,7 @@
when: apache_packages is not defined when: apache_packages is not defined
# Setup/install tasks. # Setup/install tasks.
- include: "setup-{{ ansible_os_family }}.yml" - include_tasks: "setup-{{ ansible_os_family }}.yml"
static: no
# 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.
@ -34,8 +33,7 @@
when: "apache_version.split('.')[1] == '4'" when: "apache_version.split('.')[1] == '4'"
# Configure Apache. # Configure Apache.
- include: "configure-{{ ansible_os_family }}.yml" - include_tasks: "configure-{{ ansible_os_family }}.yml"
static: no
- name: Ensure Apache has selected state and enabled on boot. - name: Ensure Apache has selected state and enabled on boot.
service: service: