Browse Source

Merge pull request #56 from thornycrackers/master

Create defaul vhost directories when DocumentRoot is not set
master
Niels Abspoel 9 years ago
parent
commit
f6a0c84544
2 changed files with 4 additions and 5 deletions
  1. +1
    -1
      README.rst
  2. +3
    -4
      apache/vhosts/standard.sls

+ 1
- 1
README.rst View File

``apache.vhosts.standard`` ``apache.vhosts.standard``
------------------------- -------------------------


Configures Apache name-based virtual hosts using data from Pillar.
Configures Apache name-based virtual hosts and creates virtual host directories using data from Pillar.


Example Pillar: Example Pillar:



+ 3
- 4
apache/vhosts/standard.sls View File

- apache - apache


{% for id, site in salt['pillar.get']('apache:sites', {}).items() %} {% for id, site in salt['pillar.get']('apache:sites', {}).items() %}
{% set documentroot = site.get('DocumentRoot', '{0}/{1}'.format(apache.wwwdir, sitename)) %}


{{ id }}: {{ id }}:
file: file:
- watch_in: - watch_in:
- module: apache-reload - module: apache-reload


{% if 'DocumentRoot' in site %}
{{ id }}-documentroot: {{ id }}-documentroot:
file.directory: file.directory:
- unless: test -d {{ site.get('DocumentRoot') }}
- name: {{ site.get('DocumentRoot') }}
- unless: test -d {{ documentroot }}
- name: {{ documentroot }}
- makedirs: True - makedirs: True
{% endif %}


{% if grains.os_family == 'Debian' %} {% if grains.os_family == 'Debian' %}
a2ensite {{ id }}{{ apache.confext }}: a2ensite {{ id }}{{ apache.confext }}:

Loading…
Cancel
Save