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

Merge pull request #27 from KennethWilke/master

Browse Source 
fixed things seth mentioned in class
This commit is contained in:
Nitin Madhok 2014-09-25 12:47:12 -04:00
commit 13fef9e9ac
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apache/init.sls
View File

@ -1,24 +1,20 @@
{% from "apache/map.jinja" import apache with context %} {% from "apache/map.jinja" import apache with context %}
apache: apache:
pkg: pkg.installed:
- installed
- name: {{ apache.server }} - name: {{ apache.server }}
service: service.running:
- 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: module.wait:
- wait
- name: service.reload - name: service.reload
- m_name: {{ apache.service }} - m_name: {{ apache.service }}
apache-restart: apache-restart:
module: module.wait:
- wait
- name: service.restart - name: service.restart
- m_name: {{ apache.service }} - m_name: {{ apache.service }}

6
apache/mod_wsgi.sls
View File

@ -4,16 +4,14 @@ include:
- apache - apache
mod_wsgi: mod_wsgi:
pkg: pkg.installed:
- 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: file.uncomment:
- uncomment
- regex: LoadModule - regex: LoadModule
- require: - require:
- pkg: mod_wsgi - pkg: mod_wsgi