basic fixes

This commit is contained in:
Imran Iqbal 2021-09-14 18:31:28 +01:00
parent 69dcfd9c3b
commit 8682dff6dc
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
3 changed files with 6 additions and 4 deletions

View File

@ -1,9 +1,11 @@
{%- set apache = pillar.get('apache', {}) %} {%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import apache with context %}
{#- set apache = pillar.get('apache', {}) #}
{%- set mod_security = apache.get('mod_security', {}) %} {%- set mod_security = apache.get('mod_security', {}) %}
{%- if mod_security.get('manage_config', False) %} {%- if mod_security.get('manage_config', False) %}
include: include:
- apache.mod_security - apache.config.modules.mod_security
{%- for rule_name, rule_details in mod_security.get('rules', {}).items() %} {%- for rule_name, rule_details in mod_security.get('rules', {}).items() %}
{%- set rule_set = rule_details.get('rule_set', '') %} {%- set rule_set = rule_details.get('rule_set', '') %}

View File

@ -13,7 +13,7 @@ include:
- {{ sls_package_install }} - {{ sls_package_install }}
apache-config-modules-upload_progress-pkg: apache-config-modules-upload_progress-pkg:
pkg.installed pkg.installed:
- name: {{ apache.mod_upload_progress }} - name: {{ apache.mod_upload_progress }}
cmd.run: cmd.run:
- name: a2enmod upload_progress - name: a2enmod upload_progress

View File

@ -464,7 +464,7 @@ apache:
sec_debug_log_level: '3' sec_debug_log_level: '3'
rules: rules:
enabled: ~ # enabled: ~
modsecurity_crs_10_setup.conf: modsecurity_crs_10_setup.conf:
rule_set: '' rule_set: ''
enabled: true enabled: true