diff --git a/tasks/checks.yml b/tasks/checks.yml index 6d45f1c7c1131d81cfceb2d67fac50532d1c975a..a3552c7573496c93cbf506225b4e282411d75602 100644 --- a/tasks/checks.yml +++ b/tasks/checks.yml @@ -201,7 +201,7 @@ - name: Set a fact for the enabled MPM set_fact: - apache_mpm_loaded: "none" + apache_mpm_loaded: "mpm_none" when: apache_mpm_check.stdout == "invalid" - name: Debug the enabled MPM diff --git a/tasks/main.yml b/tasks/main.yml index 5764f4c22d9f75d2d78095f003e4f6765b197a39..3cc42613f32cd80746cc8de584ebcbb31fc051ad 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -33,7 +33,7 @@ - name: Include MPM switching tasks include_tasks: mpm.yml - when: ( apache_mpm_loaded not in apache_mods_enabled ) or ( apache_mpm_loaded == "none" ) + when: ( apache_mpm_loaded not in apache_mods_enabled ) or ( apache_mpm_loaded == "mpm_none" ) - name: Apache config available include_tasks: config.yml diff --git a/tasks/mpm.yml b/tasks/mpm.yml index d9ea7f6f97f8d686c152780c348190df3a0af9c9..ec0d922063d810ff110da8be9e7aac503f4a3146 100644 --- a/tasks/mpm.yml +++ b/tasks/mpm.yml @@ -37,7 +37,7 @@ when: apache_mpm_event_enabled.changed when: - - ( apache_mpm_loaded == "mpm_prefork" ) or ( apache_mpm_loaded == "none" ) + - ( apache_mpm_loaded == "mpm_prefork" ) or ( apache_mpm_loaded == "mpm_none" ) - ( "mpm_event" in apache_mods_enabled ) tags: - apache @@ -65,7 +65,7 @@ when: apache_mpm_prefork_enabled.changed when: - - ( apache_mpm_loaded == "mpm_event" ) or ( apache_mpm_loaded == "none" ) + - ( apache_mpm_loaded == "mpm_event" ) or ( apache_mpm_loaded == "mpm_none" ) - ( "mpm_prefork" in apache_mods_enabled ) tags: - apache