From 8682dff6dc051dce7937e78a14716e3fe753eedf Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 14 Sep 2021 18:31:28 +0100
Subject: [PATCH] basic fixes

---
 apache/config/modules/mod_security/rules.sls  | 6 ++++--
 apache/config/modules/mod_upload_progress.sls | 2 +-
 pillar.example                                | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apache/config/modules/mod_security/rules.sls b/apache/config/modules/mod_security/rules.sls
index 8858aa0..d5bcc3d 100644
--- a/apache/config/modules/mod_security/rules.sls
+++ b/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', '') %}
diff --git a/apache/config/modules/mod_upload_progress.sls b/apache/config/modules/mod_upload_progress.sls
index 5febb54..f975d5c 100644
--- a/apache/config/modules/mod_upload_progress.sls
+++ b/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
diff --git a/pillar.example b/pillar.example
index 743596c..19f1c3a 100644
--- a/pillar.example
+++ b/pillar.example
@@ -464,7 +464,7 @@ apache:
     sec_debug_log_level: '3'
 
     rules:
-      enabled: ~
+      # enabled: ~
       modsecurity_crs_10_setup.conf:
         rule_set: ''
         enabled: true