diff --git a/nginx/ng/vhosts_config.sls b/nginx/ng/vhosts_config.sls index 8693fea..fe806a1 100644 --- a/nginx/ng/vhosts_config.sls +++ b/nginx/ng/vhosts_config.sls @@ -23,11 +23,11 @@ # Gets the path of a particular vhost {% macro vhost_path(vhost, state) -%} {%- 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 -%} - {{ 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 -%} - {{ 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 -%} {%- endmacro %} diff --git a/pillar.example b/pillar.example index c9d810a..384028e 100644 --- a/pillar.example +++ b/pillar.example @@ -74,7 +74,7 @@ nginx: managed: mysite: # relative pathname of the vhost file # 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 enabled: True