mirror of
https://github.com/geerlingguy/ansible-role-apache
synced 2024-12-22 11:00:18 +01:00
Fix deprecation warnings in Ansible 2.x. Bump required version.
This commit is contained in:
parent
2b44f305e9
commit
1bbf949a9f
9 changed files with 15 additions and 15 deletions
|
@ -6,7 +6,7 @@ galaxy_info:
|
||||||
description: Apache 2.x for RedHat/CentOS/Debian/Ubuntu/Solaris/Suse.
|
description: Apache 2.x for RedHat/CentOS/Debian/Ubuntu/Solaris/Suse.
|
||||||
company: "Midwestern Mac, LLC"
|
company: "Midwestern Mac, LLC"
|
||||||
license: "license (BSD, MIT)"
|
license: "license (BSD, MIT)"
|
||||||
min_ansible_version: 1.4
|
min_ansible_version: 1.9
|
||||||
platforms:
|
platforms:
|
||||||
- name: EL
|
- name: EL
|
||||||
versions:
|
versions:
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
regexp: "{{ item.regexp }}"
|
regexp: "{{ item.regexp }}"
|
||||||
line: "{{ item.line }}"
|
line: "{{ item.line }}"
|
||||||
state: present
|
state: present
|
||||||
with_items: apache_ports_configuration_items
|
with_items: "{{ apache_ports_configuration_items }}"
|
||||||
notify: restart apache
|
notify: restart apache
|
||||||
|
|
||||||
- name: Enable Apache mods.
|
- name: Enable Apache mods.
|
||||||
|
@ -13,20 +13,20 @@
|
||||||
src: "{{ apache_server_root }}/mods-available/{{ item }}"
|
src: "{{ apache_server_root }}/mods-available/{{ item }}"
|
||||||
dest: "{{ apache_server_root }}/mods-enabled/{{ item }}"
|
dest: "{{ apache_server_root }}/mods-enabled/{{ item }}"
|
||||||
state: link
|
state: link
|
||||||
with_items: apache_mods_enabled
|
with_items: "{{ apache_mods_enabled }}"
|
||||||
notify: restart apache
|
notify: restart apache
|
||||||
|
|
||||||
- name: Disable Apache mods.
|
- name: Disable Apache mods.
|
||||||
file:
|
file:
|
||||||
path: "{{ apache_server_root }}/mods-enabled/{{ item }}"
|
path: "{{ apache_server_root }}/mods-enabled/{{ item }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items: apache_mods_disabled
|
with_items: "{{ apache_mods_disabled }}"
|
||||||
notify: restart apache
|
notify: restart apache
|
||||||
|
|
||||||
- name: Check whether certificates defined in vhosts exist.
|
- name: Check whether certificates defined in vhosts exist.
|
||||||
stat: path={{ item.certificate_file }}
|
stat: "path={{ item.certificate_file }}"
|
||||||
register: apache_ssl_certificates
|
register: apache_ssl_certificates
|
||||||
with_items: apache_vhosts_ssl
|
with_items: "{{ apache_vhosts_ssl }}"
|
||||||
|
|
||||||
- name: Add apache vhosts configuration.
|
- name: Add apache vhosts configuration.
|
||||||
template:
|
template:
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
regexp: "{{ item.regexp }}"
|
regexp: "{{ item.regexp }}"
|
||||||
line: "{{ item.line }}"
|
line: "{{ item.line }}"
|
||||||
state: present
|
state: present
|
||||||
with_items: apache_ports_configuration_items
|
with_items: "{{ apache_ports_configuration_items }}"
|
||||||
notify: restart apache
|
notify: restart apache
|
||||||
|
|
||||||
- name: Check whether certificates defined in vhosts exist.
|
- name: Check whether certificates defined in vhosts exist.
|
||||||
stat: path={{ item.certificate_file }}
|
stat: path={{ item.certificate_file }}
|
||||||
register: apache_ssl_certificates
|
register: apache_ssl_certificates
|
||||||
with_items: apache_vhosts_ssl
|
with_items: "{{ apache_vhosts_ssl }}"
|
||||||
|
|
||||||
- name: Add apache vhosts configuration.
|
- name: Add apache vhosts configuration.
|
||||||
template:
|
template:
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
regexp: "{{ item.regexp }}"
|
regexp: "{{ item.regexp }}"
|
||||||
line: "{{ item.line }}"
|
line: "{{ item.line }}"
|
||||||
state: present
|
state: present
|
||||||
with_items: apache_ports_configuration_items
|
with_items: "{{ apache_ports_configuration_items }}"
|
||||||
notify: restart apache
|
notify: restart apache
|
||||||
|
|
||||||
- name: Add apache vhosts configuration.
|
- name: Add apache vhosts configuration.
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
regexp: "{{ item.regexp }}"
|
regexp: "{{ item.regexp }}"
|
||||||
line: "{{ item.line }}"
|
line: "{{ item.line }}"
|
||||||
state: present
|
state: present
|
||||||
with_items: apache_ports_configuration_items
|
with_items: "{{ apache_ports_configuration_items }}"
|
||||||
notify: restart apache
|
notify: restart apache
|
||||||
|
|
||||||
- name: Check whether certificates defined in vhosts exist.
|
- name: Check whether certificates defined in vhosts exist.
|
||||||
stat: path={{ item.certificate_file }}
|
stat: path={{ item.certificate_file }}
|
||||||
register: apache_ssl_certificates
|
register: apache_ssl_certificates
|
||||||
with_items: apache_vhosts_ssl
|
with_items: "{{ apache_vhosts_ssl }}"
|
||||||
|
|
||||||
- name: Add apache vhosts configuration.
|
- name: Add apache vhosts configuration.
|
||||||
template:
|
template:
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
|
|
||||||
- name: Ensure Apache is installed on Debian.
|
- name: Ensure Apache is installed on Debian.
|
||||||
apt: "name={{ item }} state=installed"
|
apt: "name={{ item }} state=installed"
|
||||||
with_items: apache_packages
|
with_items: "{{ apache_packages }}"
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
state: installed
|
state: installed
|
||||||
enablerepo: "{{ apache_enablerepo }}"
|
enablerepo: "{{ apache_enablerepo }}"
|
||||||
with_items: apache_packages
|
with_items: "{{ apache_packages }}"
|
||||||
|
|
|
@ -3,4 +3,4 @@
|
||||||
pkg5:
|
pkg5:
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
state: installed
|
state: installed
|
||||||
with_items: apache_packages
|
with_items: "{{ apache_packages }}"
|
||||||
|
|
|
@ -3,4 +3,4 @@
|
||||||
zypper:
|
zypper:
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
state: installed
|
state: installed
|
||||||
with_items: apache_packages
|
with_items: "{{ apache_packages }}"
|
||||||
|
|
Loading…
Reference in a new issue