diff --git a/apache/map.jinja b/apache/map.jinja index 7dcd50c..a623556 100644 --- a/apache/map.jinja +++ b/apache/map.jinja @@ -54,6 +54,7 @@ 'configfile': '/etc/httpd/conf/httpd.conf', 'mod_wsgi': 'mod_wsgi', + 'conf_mod_wsgi': '/etc/httpd/conf.d/wsgi.conf', 'mod_php5': 'php', 'mod_pagespeed_source': 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_x86_64.rpm', diff --git a/apache/mod_wsgi.sls b/apache/mod_wsgi.sls index bda0274..aa3fd21 100644 --- a/apache/mod_wsgi.sls +++ b/apache/mod_wsgi.sls @@ -9,11 +9,11 @@ mod_wsgi: - require: - pkg: apache -{% if grains.get('os_family') == 'RedHat' %} -/etc/httpd/conf.d/wsgi.conf: +{% if apache.conf_mod_wsgi %} +{{ apache.conf_mod_wsgi }}: file.uncomment: - regex: LoadModule - - onlyif: test -f /etc/httpd/conf.d/wsgi.conf + - onlyif: test -f {{ apache.conf_mod_wsgi }} - require: - pkg: mod_wsgi {% endif %} diff --git a/apache/osfingermap.yaml b/apache/osfingermap.yaml index abef80b..9b77b89 100644 --- a/apache/osfingermap.yaml +++ b/apache/osfingermap.yaml @@ -10,6 +10,7 @@ CentOS Linux-6: version: '2.2' CentOS Linux-7: version: '2.4' + conf_mod_wsgi: '/etc/httpd/conf.modules.d/10-wsgi.conf' Oracle Linux Server-6: version: '2.2' Oracle Linux Server-7: