From 9479a81837cbde123c8c1d207f37950debf9ef9b Mon Sep 17 00:00:00 2001
From: Chris Croome <chris@webarchitects.co.uk>
Date: Mon, 27 Jan 2020 15:05:50 +0000
Subject: [PATCH] s/None/mpm_none/
---
tasks/checks.yml | 2 +-
tasks/main.yml | 2 +-
tasks/mpm.yml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tasks/checks.yml b/tasks/checks.yml
index 6d45f1c..a3552c7 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 5764f4c..3cc4261 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 d9ea7f6..ec0d922 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
--
GitLab