Browse Source

Added mod_wsgi to package-map

tags/v0.37.4
Seth House 11 years ago
parent
commit
3f8a1edb97
3 changed files with 5 additions and 5 deletions
  1. +2
    -5
      apache/mod_wsgi.sls
  2. +2
    -0
      apache/package-map.jinja
  3. +1
    -0
      pillar.example

+ 2
- 5
apache/mod_wsgi.sls View File

@@ -1,12 +1,9 @@
{% set pkg = salt['grains.filter_by']({
'Debian': {'name': 'libapache2-mod-wsgi'},
'RedHat': {'name': 'mod_wsgi'},
}) %}
{% from "apache/package-map.jinja" import apache with context %}

mod_wsgi:
pkg:
- installed
- name: {{ pkg.name }}
- name: {{ apache.mod_wsgi }}

{% if grains.get('os_family') == 'RedHat' %}
/etc/httpd/conf.d/wsgi.conf:

+ 2
- 0
apache/package-map.jinja View File

@@ -3,10 +3,12 @@
'server': 'apache2',
'service': 'apache2',
'conf': '/etc/apache2/conf.d',
'mod_wsgi': 'libapache2-mod-wsgi',
},
'RedHat': {
'server': 'httpd',
'service': 'httpd',
'conf': '/etc/httpd/conf.d',
'mod_wsgi': 'mod_wsgi',
},
}, merge=salt['pillar.get']('apache:lookup')) %}

+ 1
- 0
pillar.example View File

@@ -3,6 +3,7 @@ apache:
server: apache2
service: apache2
conf: /etc/apache2/conf.d
mod_wsgi: mod_wsgi

# ``apache.debian_full`` formula additional configuration:
apache:

Loading…
Cancel
Save