saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #272 from dimitry-unified-streaming/fix-mpm_prefork-jinja

Browse Source 
fix(mod_mpm): cast to int to avoid Jinja type mismatch error
This commit is contained in:
Imran Iqbal 2019-12-20 16:52:13 +00:00 committed by GitHub
commit e5579930e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/files/Debian/mpm/mpm_prefork.conf.jinja
View File

@ -14,7 +14,7 @@
<IfModule mpm_prefork_module> <IfModule mpm_prefork_module>
StartServers {{ mpm_param['start_servers'] | d('5') }} StartServers {{ mpm_param['start_servers'] | d('5') }}
MaxRequestWorkers {{ mpm_param['max_request_workers'] | d('150') }} MaxRequestWorkers {{ mpm_param['max_request_workers'] | d('150') }}
{%- if mpm_param['max_request_workers'] | d('150') >= 256 %} {%- if mpm_param['max_request_workers'] | d('150') | int >= 256 %}
ServerLimit {{ mpm_param['max_request_workers'] | d('150') }} ServerLimit {{ mpm_param['max_request_workers'] | d('150') }}
{%- endif %} {%- endif %}
MinSpareServers {{ mpm_param['min_spare_servers'] | d('5') }} MinSpareServers {{ mpm_param['min_spare_servers'] | d('5') }}

2
apache/files/RedHat/conf.modules.d/00-mpm.conf.jinja
View File

@ -21,7 +21,7 @@ LoadModule {{ mpm_module }}_module modules/mod_{{ mpm_module }}.so
<IfModule mpm_prefork_module> <IfModule mpm_prefork_module>
StartServers {{ mpm_param['start_servers'] | d('5') }} StartServers {{ mpm_param['start_servers'] | d('5') }}
MaxRequestWorkers {{ mpm_param['max_request_workers'] | d('150') }} MaxRequestWorkers {{ mpm_param['max_request_workers'] | d('150') }}
{%- if mpm_param['max_request_workers'] | d('150') >= 256 %} {%- if mpm_param['max_request_workers'] | d('150') | int >= 256 %}
ServerLimit {{ mpm_param['max_request_workers'] | d('150') }} ServerLimit {{ mpm_param['max_request_workers'] | d('150') }}
{%- endif %} {%- endif %}
MinSpareServers {{ mpm_param['min_spare_servers'] | d('5') }} MinSpareServers {{ mpm_param['min_spare_servers'] | d('5') }}