From 5591be26fddd234ebaed0e024969c45b6536ba82 Mon Sep 17 00:00:00 2001
From: Andreas Thienemann <andreas@bawue.net>
Date: Thu, 2 Apr 2020 18:29:06 +0200
Subject: [PATCH] fix(mod_ssl): update mod_ssl package variable to prevent
 clashes

The mod_ssl package name could be overridden in apache:lookup:mod_ssl.
Due to the way lookup keys are merged into the main apache dictionary,
the package name clashed with the mod_ssl configuration defined under
apache:mod_ssl.

Fix that by renaming the mod_ssl package variable to mod_ssl_pkg.

Drive-By: Add mod_ssl_pkg to the pillar.example file.
---
 apache/mod_ssl.sls      | 2 +-
 apache/osfamilymap.yaml | 2 +-
 pillar.example          | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apache/mod_ssl.sls b/apache/mod_ssl.sls
index f420ecb..ea43a60 100644
--- a/apache/mod_ssl.sls
+++ b/apache/mod_ssl.sls
@@ -31,7 +31,7 @@ a2enmod mod_ssl:
 
 mod_ssl:
   pkg.installed:
-    - name: {{ apache.mod_ssl }}
+    - name: {{ apache.mod_ssl_pkg }}
     - require:
       - pkg: apache
     - watch_in:
diff --git a/apache/osfamilymap.yaml b/apache/osfamilymap.yaml
index 0a2fe88..9a176c4 100644
--- a/apache/osfamilymap.yaml
+++ b/apache/osfamilymap.yaml
@@ -36,7 +36,7 @@ RedHat:
   group: apache
   configfile: /etc/httpd/conf/httpd.conf
 
-  mod_ssl: mod_ssl
+  mod_ssl_pkg: mod_ssl
   mod_wsgi: mod_wsgi
   conf_mod_wsgi: /etc/httpd/conf.d/wsgi.conf
   mod_php5: php
diff --git a/pillar.example b/pillar.example
index d29efbb..73ced33 100644
--- a/pillar.example
+++ b/pillar.example
@@ -23,6 +23,9 @@ apache:
     # apache version (generally '2.2' or '2.4')
     version: '2.2'
 
+    # mod_ssl package name
+    mod_ssl_pkg: mod_ssl
+
     # ``apache.mod_wsgi`` formula additional configuration:
     mod_wsgi: mod_wsgi