Bladeren bron

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.
tags/v0.39.4
Andreas Thienemann 4 jaren geleden
bovenliggende
commit
5591be26fd
No account linked to committer's email address
3 gewijzigde bestanden met toevoegingen van 5 en 2 verwijderingen
  1. +1
    -1
      apache/mod_ssl.sls
  2. +1
    -1
      apache/osfamilymap.yaml
  3. +3
    -0
      pillar.example

+ 1
- 1
apache/mod_ssl.sls Bestand weergeven

@@ -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:

+ 1
- 1
apache/osfamilymap.yaml Bestand weergeven

@@ -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

+ 3
- 0
pillar.example Bestand weergeven

@@ -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


Laden…
Annuleren
Opslaan