basic fixes

apache/config/modules/mod_security/rules.sls

@@ -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', {}) %}
 {%- if mod_security.get('manage_config', False) %}
 
 include:
-  - apache.mod_security
+  - apache.config.modules.mod_security
 
 {%- for rule_name, rule_details in mod_security.get('rules', {}).items() %}
   {%- set rule_set = rule_details.get('rule_set', '') %}

apache/config/modules/mod_upload_progress.sls

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

pillar.example

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