Browse Source

Merge pull request #20 from adamherzog/redhat-vhost-config-extension

Add vhost config file extension for RedHat-based distributions
tags/v0.37.4
Joseph Hall 11 years ago
parent
commit
989ae09576
3 changed files with 6 additions and 1 deletions
  1. +3
    -0
      apache/map.jinja
  2. +1
    -1
      apache/vhosts/standard.sls
  3. +2
    -0
      pillar.example

+ 3
- 0
apache/map.jinja View File



'vhostdir': '/etc/apache2/sites-available', 'vhostdir': '/etc/apache2/sites-available',
'confdir': '/etc/apache2/conf.d', 'confdir': '/etc/apache2/conf.d',
'confext': '',
'logdir': '/var/log/apache2', 'logdir': '/var/log/apache2',
'wwwdir': '/srv', 'wwwdir': '/srv',
}, },


'vhostdir': '/etc/httpd/conf.d', 'vhostdir': '/etc/httpd/conf.d',
'confdir': '/etc/httpd/conf.d', 'confdir': '/etc/httpd/conf.d',
'confext': '.conf',
'logdir': '/var/log/httpd', 'logdir': '/var/log/httpd',
'wwwdir': '/var/www', 'wwwdir': '/var/www',
}, },


'vhostdir': '/usr/local/etc/apache22/Includes', 'vhostdir': '/usr/local/etc/apache22/Includes',
'confdir': '/usr/local/etc/apache22/Includes', 'confdir': '/usr/local/etc/apache22/Includes',
'confext': '',
'logdir': '/var/log/', 'logdir': '/var/log/',
'wwwdir': '/usr/local/www/apache22/', 'wwwdir': '/usr/local/www/apache22/',
}, },

+ 1
- 1
apache/vhosts/standard.sls View File

{{ id }}: {{ id }}:
file: file:
- managed - managed
- name: {{ apache.vhostdir }}/{{ id }}
- name: {{ apache.vhostdir }}/{{ id }}{{ apache.confext }}
- source: {{ site.get('template_file', 'salt://apache/vhosts/standard.tmpl') }} - source: {{ site.get('template_file', 'salt://apache/vhosts/standard.tmpl') }}
- template: {{ site.get('template_engine', 'jinja') }} - template: {{ site.get('template_engine', 'jinja') }}
- context: - context:

+ 2
- 0
pillar.example View File

server: apache2 server: apache2
service: apache2 service: apache2


vhostdir: /etc/apache2/sites-available
confdir: /etc/apache2/conf.d confdir: /etc/apache2/conf.d
confext: .conf
logdir: /var/log/apache2 logdir: /var/log/apache2
wwwdir: /srv/apache2 wwwdir: /srv/apache2



Loading…
Cancel
Save