diff --git a/tasks/a2mod.yml b/tasks/a2mod.yml index 18a0c6eb4ab9872fafba6ee64c66a3a2d572db0b..b08e1c405b820153c5fc1d82b03946cada7d37c3 100644 --- a/tasks/a2mod.yml +++ b/tasks/a2mod.yml @@ -8,7 +8,7 @@ - libapache2-mpm-itk state: absent update_cache: false - when: '"mpm-itk" in apache_mods_disabled' + when: '"mpm_itk" in apache_mods_disabled' - name: Apache FastCGI absent apt: @@ -59,7 +59,7 @@ - libapache2-mpm-itk state: present update_cache: false - when: '"mpm-itk" in apache_mods_enabled' + when: '"mpm_itk" in apache_mods_enabled' - name: Apache Suexec package present apt: diff --git a/tasks/config.yml b/tasks/config.yml index 5010afa2b6e4fab1cae8511262493add5005077d..d8473b80063f4c029a71b11e529c4ab178d83708 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -58,7 +58,7 @@ template: src: templates/mpm_prefork.conf.j2 dest: /etc/apache2/mods-available/mpm_prefork.conf - when: ( "mpm-itk" in apache_mods_enabled ) or ( "php7.0" in apache_mods_enabled ) or ( "php7.3" in apache_mods_enabled ) + when: ( "mpm_itk" in apache_mods_enabled ) or ( apache_phpfpm_mod in apache_mods_enabled ) - name: Apache ratelimit conf present template: diff --git a/templates/localhost.conf.j2 b/templates/localhost.conf.j2 index ce2462bfb6f5ed5ed173d6e162d10cd99e7813b6..b414395016722b734fb011b17f2002c760f01d6e 100644 --- a/templates/localhost.conf.j2 +++ b/templates/localhost.conf.j2 @@ -3,7 +3,7 @@ <VirtualHost 127.0.0.1:80> ServerName localhost {% if apache_mods_enabled is defined %} -{% if "mpm-itk" in apache_mods_enabled %} +{% if "mpm_itk" in apache_mods_enabled %} <IfModule mpm_itk_module> AssignUserID www-data www-data </IfModule> @@ -35,7 +35,7 @@ AllowOverride AuthConfig Indexes FileInfo Limit Require host localhost 127.0.0.1 ::1 {% if apache_mods_enabled is defined %} -{% if "php7.0" in apache_mods_enabled or "php7.2" in apache_mods_enabled or "php7.3" in apache_mods_enabled %} +{% if apache_phpfpm_mod in apache_mods_enabled %} <IfModule php7_module> php_admin_value doc_root /var/www/localhost php_admin_value open_basedir /var/www/localhost/:/tmp/:/usr/share/php/ diff --git a/templates/mpm_prefork.conf.j2 b/templates/mpm_prefork.conf.j2 index 6550a1d53c1452ad6b1d67d62a01f8c77f6d0a3d..93d101e8366e3de5b2cd5c9acb97703315f4e926 100644 --- a/templates/mpm_prefork.conf.j2 +++ b/templates/mpm_prefork.conf.j2 @@ -12,8 +12,8 @@ MaxSpareServers 10 MaxRequestWorkers {{ apache_mpm_max_request_workers | default('150') }} MaxConnectionsPerChild {{ apache_mpm_max_connections_per_child | default ('0') }} -{% if "mpm-itk" in apache_mods_enabled %} - # Fix for exim panic log issue with mod-itk +{% if "mpm_itk" in apache_mods_enabled %} + # Fix for exim panic log issue with mod_itk LimitUIDRange 0 2000 {% endif %}