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

Merge pull request #176 from porunov/master

Browse Source 
Clear uncomment state of mod_wsgi config
This commit is contained in:
Javier Bértoli 2017-04-06 12:18:18 -03:00 committed by GitHub
commit 919f2a38d2
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apache/map.jinja
View File

@ -54,6 +54,7 @@
'configfile': '/etc/httpd/conf/httpd.conf', 'configfile': '/etc/httpd/conf/httpd.conf',
'mod_wsgi': 'mod_wsgi', 'mod_wsgi': 'mod_wsgi',
'conf_mod_wsgi': '/etc/httpd/conf.d/wsgi.conf',
'mod_php5': 'php', 'mod_php5': 'php',
'mod_pagespeed_source': 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_x86_64.rpm', 'mod_pagespeed_source': 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_x86_64.rpm',

6
apache/mod_wsgi.sls
View File

@ -9,11 +9,11 @@ mod_wsgi:
- require: - require:
- pkg: apache - pkg: apache
{% if grains.get('os_family') == 'RedHat' %} {% if apache.conf_mod_wsgi %}
/etc/httpd/conf.d/wsgi.conf: {{ apache.conf_mod_wsgi }}:
file.uncomment: file.uncomment:
- regex: LoadModule - regex: LoadModule
- onlyif: test -f /etc/httpd/conf.d/wsgi.conf - onlyif: test -f {{ apache.conf_mod_wsgi }}
- require: - require:
- pkg: mod_wsgi - pkg: mod_wsgi
{% endif %} {% endif %}

1
apache/osfingermap.yaml
View File

@ -10,6 +10,7 @@ CentOS Linux-6:
version: '2.2' version: '2.2'
CentOS Linux-7: CentOS Linux-7:
version: '2.4' version: '2.4'
conf_mod_wsgi: '/etc/httpd/conf.modules.d/10-wsgi.conf'
Oracle Linux Server-6: Oracle Linux Server-6:
version: '2.2' version: '2.2'
Oracle Linux Server-7: Oracle Linux Server-7: