Browse Source

fixed things seth mentioned in class

tags/v0.37.4
KennethWilke 10 years ago
parent
commit
964b653692
2 changed files with 6 additions and 12 deletions
  1. +4
    -8
      apache/init.sls
  2. +2
    -4
      apache/mod_wsgi.sls

+ 4
- 8
apache/init.sls View File

{% from "apache/map.jinja" import apache with context %} {% from "apache/map.jinja" import apache with context %}


apache: apache:
pkg:
- installed
pkg.installed:
- name: {{ apache.server }} - name: {{ apache.server }}
service:
- running
service.running:
- name: {{ apache.service }} - name: {{ apache.service }}
- enable: True - enable: True


# The following states are inert by default and can be used by other states to # The following states are inert by default and can be used by other states to
# trigger a restart or reload as needed. # trigger a restart or reload as needed.
apache-reload: apache-reload:
module:
- wait
module.wait:
- name: service.reload - name: service.reload
- m_name: {{ apache.service }} - m_name: {{ apache.service }}


apache-restart: apache-restart:
module:
- wait
module.wait:
- name: service.restart - name: service.restart
- m_name: {{ apache.service }} - m_name: {{ apache.service }}

+ 2
- 4
apache/mod_wsgi.sls View File

- apache - apache


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


{% if grains.get('os_family') == 'RedHat' %} {% if grains.get('os_family') == 'RedHat' %}
/etc/httpd/conf.d/wsgi.conf: /etc/httpd/conf.d/wsgi.conf:
file:
- uncomment
file.uncomment:
- regex: LoadModule - regex: LoadModule
- require: - require:
- pkg: mod_wsgi - pkg: mod_wsgi

Loading…
Cancel
Save