Browse Source

Separate 'dir' into 'available_dir' and 'enabled_dir'

susefix
Imran Haider 9 years ago
parent
commit
481c3d6aa4
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      nginx/ng/vhosts_config.sls
  2. +1
    -1
      pillar.example

+ 3
- 3
nginx/ng/vhosts_config.sls View File

# Gets the path of a particular vhost # Gets the path of a particular vhost
{% macro vhost_path(vhost, state) -%} {% macro vhost_path(vhost, state) -%}
{%- if state == True -%} {%- if state == True -%}
{{ path_join(vhost, nginx.vhosts.managed.get(vhost).get('dir', nginx.lookup.vhost_enabled)) }}
{{ path_join(vhost, nginx.vhosts.managed.get(vhost).get('enabled_dir', nginx.lookup.vhost_enabled)) }}
{%- elif state == False -%} {%- elif state == False -%}
{{ path_join(disabled_name(vhost), nginx.vhosts.managed.get(vhost).get('dir', nginx.lookup.vhost_available)) }}
{{ path_join(disabled_name(vhost), nginx.vhosts.managed.get(vhost).get('available_dir', nginx.lookup.vhost_available)) }}
{%- else -%} {%- else -%}
{{ path_join(vhost, nginx.vhosts.managed.get(vhost).get('dir', nginx.lookup.vhost_available)) }}
{{ path_join(vhost, nginx.vhosts.managed.get(vhost).get('available_dir', nginx.lookup.vhost_available)) }}
{%- endif -%} {%- endif -%}
{%- endmacro %} {%- endmacro %}



+ 1
- 1
pillar.example View File

managed: managed:
mysite: # relative pathname of the vhost file mysite: # relative pathname of the vhost file
# may be True, False, or None where True is enabled, False, disabled, and None indicates no action # may be True, False, or None where True is enabled, False, disabled, and None indicates no action
dir: /tmp # an alternate directory (not sites-available) where this vhost may be found
available_dir: /tmp # an alternate directory (not sites-available) where this vhost may be found
disabled_name: mysite.aint_on # an alternative disabled name to be use when not symlinking disabled_name: mysite.aint_on # an alternative disabled name to be use when not symlinking
enabled: True enabled: True

Loading…
Cancel
Save