mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 06:12:51 +00:00
Add identifier option to apache2_module (#33748)
* Add identifier option to apache2_module There is a convention connecting the name passed to a2enmod and the one appearing in apache2ctl -M. Not all modules follow this convention and we have added a growing list of implicit conversions. As a better long-term solution this adds an "identifier" option to be able to set both strings explicitly. * Run debian-specific tests only there * Improve cleanup after apache2 tests This is a follow-up/extension of https://github.com/ansible/ansible/pull/33630 * Add example for the new identifier option * Put all debian tests in a block
This commit is contained in:
Robin Roth
René Moser
@@ -32,6 +32,7 @@
|
||||
apache2_module:
|
||||
name: userdir
|
||||
state: absent
|
||||
register: userdir_first_disable
|
||||
|
||||
- name: disable userdir module, second run
|
||||
apache2_module:
|
||||
@@ -42,7 +43,7 @@
|
||||
- name: ensure apache2_module is idempotent
|
||||
assert:
|
||||
that:
|
||||
- 'not disable.changed'
|
||||
- disable is not changed
|
||||
|
||||
- name: enable userdir module
|
||||
apache2_module:
|
||||
@@ -53,7 +54,7 @@
|
||||
- name: ensure changed on successful enable
|
||||
assert:
|
||||
that:
|
||||
- 'enable.changed'
|
||||
- enable is changed
|
||||
|
||||
- name: enable userdir module, second run
|
||||
apache2_module:
|
||||
@@ -77,100 +78,154 @@
|
||||
that:
|
||||
- 'disablefinal.changed'
|
||||
|
||||
- name: set userdir to original state
|
||||
apache2_module:
|
||||
name: userdir
|
||||
state: present
|
||||
when: userdir_first_disable is changed
|
||||
|
||||
- name: ensure autoindex enabled
|
||||
apache2_module:
|
||||
name: autoindex
|
||||
state: present
|
||||
|
||||
- name: force disable of autoindex # bug #2499
|
||||
apache2_module:
|
||||
name: autoindex
|
||||
state: absent
|
||||
force: True
|
||||
- name: Debian/Ubuntu specific tests
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
|
||||
- name: enable evasive module, test https://github.com/ansible/ansible/issues/22635
|
||||
apache2_module:
|
||||
name: evasive
|
||||
state: present
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
|
||||
- name: disable mpm modules
|
||||
apache2_module:
|
||||
name: "{{ item }}"
|
||||
state: absent
|
||||
ignore_configcheck: True
|
||||
with_items:
|
||||
- mpm_worker
|
||||
- mpm_event
|
||||
- mpm_prefork
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
|
||||
- name: enabled mpm_event
|
||||
apache2_module:
|
||||
name: mpm_event
|
||||
state: present
|
||||
ignore_configcheck: True
|
||||
register: enabledmpmevent
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
|
||||
- name: ensure changed mpm_event
|
||||
assert:
|
||||
that:
|
||||
- 'enabledmpmevent.changed'
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
|
||||
- name: switch between mpm_event and mpm_worker
|
||||
apache2_module:
|
||||
name: "{{ item.name }}"
|
||||
state: "{{ item.state }}"
|
||||
ignore_configcheck: True
|
||||
with_items:
|
||||
- name: mpm_event
|
||||
block:
|
||||
- name: force disable of autoindex # bug #2499
|
||||
apache2_module:
|
||||
name: autoindex
|
||||
state: absent
|
||||
- name: mpm_worker
|
||||
force: True
|
||||
|
||||
- name: reenable autoindex
|
||||
apache2_module:
|
||||
name: autoindex
|
||||
state: present
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
|
||||
- name: ensure mpm_worker is already enabled
|
||||
apache2_module:
|
||||
name: mpm_worker
|
||||
state: present
|
||||
register: enabledmpmworker
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
- name: enable evasive module, test https://github.com/ansible/ansible/issues/22635
|
||||
apache2_module:
|
||||
name: evasive
|
||||
state: present
|
||||
|
||||
- name: ensure mpm_worker unchanged
|
||||
assert:
|
||||
that:
|
||||
- 'not enabledmpmworker.changed'
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
- name: disable evasive module
|
||||
apache2_module:
|
||||
name: evasive
|
||||
state: absent
|
||||
|
||||
- name: try to disable all mpm modules with configcheck
|
||||
apache2_module:
|
||||
name: "{{item}}"
|
||||
state: absent
|
||||
with_items:
|
||||
- mpm_worker
|
||||
- mpm_event
|
||||
- mpm_prefork
|
||||
ignore_errors: yes
|
||||
register: remove_with_configcheck
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
- name: use identifier to enable module, fix for https://github.com/ansible/ansible/issues/33669
|
||||
apache2_module:
|
||||
name: dump_io
|
||||
state: present
|
||||
ignore_errors: True
|
||||
register: enable_dumpio_wrong
|
||||
|
||||
- name: ensure configcheck fails task with when run without mpm modules
|
||||
assert:
|
||||
that:
|
||||
- "{{ item.failed }}"
|
||||
with_items: "{{ remove_with_configcheck.results }}"
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
- name: disable dump_io
|
||||
apache2_module:
|
||||
name: dump_io
|
||||
identifier: dumpio_module
|
||||
state: absent
|
||||
|
||||
- name: try to disable all mpm modules without configcheck
|
||||
apache2_module:
|
||||
name: "{{item}}"
|
||||
state: absent
|
||||
ignore_configcheck: True
|
||||
with_items:
|
||||
- mpm_worker
|
||||
- mpm_event
|
||||
- mpm_prefork
|
||||
when: "ansible_os_family == 'Debian'"
|
||||
- name: use identifier to enable module, fix for https://github.com/ansible/ansible/issues/33669
|
||||
apache2_module:
|
||||
name: dump_io
|
||||
identifier: dumpio_module
|
||||
state: present
|
||||
register: enable_dumpio_correct_1
|
||||
|
||||
- name: ensure idempotency with identifier
|
||||
apache2_module:
|
||||
name: dump_io
|
||||
identifier: dumpio_module
|
||||
state: present
|
||||
register: enable_dumpio_correct_2
|
||||
|
||||
- name: disable dump_io
|
||||
apache2_module:
|
||||
name: dump_io
|
||||
identifier: dumpio_module
|
||||
state: absent
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- enable_dumpio_wrong is failed
|
||||
- enable_dumpio_correct_1 is changed
|
||||
- enable_dumpio_correct_2 is not changed
|
||||
|
||||
- name: disable mpm modules
|
||||
apache2_module:
|
||||
name: "{{ item }}"
|
||||
state: absent
|
||||
ignore_configcheck: True
|
||||
with_items:
|
||||
- mpm_worker
|
||||
- mpm_event
|
||||
- mpm_prefork
|
||||
|
||||
- name: enabled mpm_event
|
||||
apache2_module:
|
||||
name: mpm_event
|
||||
state: present
|
||||
ignore_configcheck: True
|
||||
register: enabledmpmevent
|
||||
|
||||
- name: ensure changed mpm_event
|
||||
assert:
|
||||
that:
|
||||
- 'enabledmpmevent.changed'
|
||||
|
||||
- name: switch between mpm_event and mpm_worker
|
||||
apache2_module:
|
||||
name: "{{ item.name }}"
|
||||
state: "{{ item.state }}"
|
||||
ignore_configcheck: True
|
||||
with_items:
|
||||
- name: mpm_event
|
||||
state: absent
|
||||
- name: mpm_worker
|
||||
state: present
|
||||
|
||||
- name: ensure mpm_worker is already enabled
|
||||
apache2_module:
|
||||
name: mpm_worker
|
||||
state: present
|
||||
register: enabledmpmworker
|
||||
|
||||
- name: ensure mpm_worker unchanged
|
||||
assert:
|
||||
that:
|
||||
- 'not enabledmpmworker.changed'
|
||||
|
||||
- name: try to disable all mpm modules with configcheck
|
||||
apache2_module:
|
||||
name: "{{item}}"
|
||||
state: absent
|
||||
with_items:
|
||||
- mpm_worker
|
||||
- mpm_event
|
||||
- mpm_prefork
|
||||
ignore_errors: yes
|
||||
register: remove_with_configcheck
|
||||
|
||||
- name: ensure configcheck fails task with when run without mpm modules
|
||||
assert:
|
||||
that:
|
||||
- "{{ item.failed }}"
|
||||
with_items: "{{ remove_with_configcheck.results }}"
|
||||
|
||||
- name: try to disable all mpm modules without configcheck
|
||||
apache2_module:
|
||||
name: "{{item}}"
|
||||
state: absent
|
||||
ignore_configcheck: True
|
||||
with_items:
|
||||
- mpm_worker
|
||||
- mpm_event
|
||||
- mpm_prefork
|
||||
|
||||
- name: enabled mpm_event to restore previous state
|
||||
apache2_module:
|
||||
name: mpm_event
|
||||
state: present
|
||||
ignore_configcheck: True
|
||||
register: enabledmpmevent
|
||||
|
||||
Reference in New Issue
Block a user