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

fix(mod_ssl): update mod_ssl package variable to prevent clashes

Browse Source 
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.
This commit is contained in:
Andreas Thienemann 2020-04-02 18:29:06 +02:00 committed by GitHub
parent 01d7f656bc
commit 5591be26fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/mod_ssl.sls
View File

@ -31,7 +31,7 @@ a2enmod mod_ssl:
mod_ssl: mod_ssl:
pkg.installed: pkg.installed:
- name: {{ apache.mod_ssl }} - name: {{ apache.mod_ssl_pkg }}
- require: - require:
- pkg: apache - pkg: apache
- watch_in: - watch_in:

2
apache/osfamilymap.yaml
View File

@ -36,7 +36,7 @@ RedHat:
group: apache group: apache
configfile: /etc/httpd/conf/httpd.conf configfile: /etc/httpd/conf/httpd.conf
mod_ssl: mod_ssl mod_ssl_pkg: mod_ssl
mod_wsgi: mod_wsgi mod_wsgi: mod_wsgi
conf_mod_wsgi: /etc/httpd/conf.d/wsgi.conf conf_mod_wsgi: /etc/httpd/conf.d/wsgi.conf
mod_php5: php mod_php5: php

3
pillar.example
View File

@ -23,6 +23,9 @@ apache:
# apache version (generally '2.2' or '2.4') # apache version (generally '2.2' or '2.4')
version: '2.2' version: '2.2'
# mod_ssl package name
mod_ssl_pkg: mod_ssl
# ``apache.mod_wsgi`` formula additional configuration: # ``apache.mod_wsgi`` formula additional configuration:
mod_wsgi: mod_wsgi mod_wsgi: mod_wsgi