Finishes vhost config template

nginx/ng/files/vhost.conf

@@ -0,0 +1,29 @@
+{% set ind_increment = 4 %}
+{%- macro vhost_config(values, key='', ind=0, lb='\n', delim=';', operator=' ') -%}
+    {%- for value in values -%}
+        {%- if value is number or value is string -%}
+{{ lb }}{{ key|indent(ind, True) }}{{ operator }}{{ value }}{{ delim }}
+        {%- elif value is mapping -%}
+            {%- for k, v in value.items() -%}
+                {%- if v is number or v is string -%}
+{{ vhost_config([v], k, ind) }}
+                {%- elif v|length() > 0 and (v[0] is number or v[0] is string) -%}
+{{ lb }}{{ k|indent(ind,True) }}{{ vhost_config(v,'', 0, '', '')}}{{ delim }}
+                {%- else %}
+{{ k|indent(ind, True) }} {{ '{' }}
+{{- vhost_config(v, '', ind + ind_increment) }}
+{{ '}'|indent(ind, True) }}
+                {%- endif -%}
+            {%- endfor -%}
+        {%- elif value is iterable -%}
+{{ vhost_config(value, ind + ind_increment, delim, operator) }}
+        {%- endif -%}
+    {%- endfor -%}
+{%- endmacro -%}
+
+# Nginx vhost configuration
+#
+# **** DO NOT EDIT THIS FILE ****
+#
+# This file is managed by Salt.
+{{ vhost_config(config) }}

nginx/ng/map.jinja

@@ -68,8 +68,7 @@
         'dir_opts': {
             'makedirs': True,
         },
-        'managed': {}
-        },
+        'managed': {},
     },
 }, merge=True) %}
 

nginx/ng/vhosts_config.sls

@@ -92,7 +92,7 @@ nginx_vhost_available_dir:
     - source: salt://nginx/ng/files/vhost.conf
     - template: jinja
     - context:
-      config: settings.config
+      config: {{ settings.config }}
 {% do vhost_states.append(conf_state_id) %}
 {% endif %}
 

pillar.example

@@ -13,55 +13,84 @@ nginx:
 # ========
 
 nginx:
-  # These are usually set by grains in map.jinja
-  lookup:
-    package: nginx-custom
-    service: nginx
-    webuser: www-data
-    conf_file: /etc/nginx/nginx.conf
-    vhost_available: /etc/nginx/sites-available
-    vhost_enabled: /etc/nginx/sites-enabled
-    vhost_use_symlink: True
+  ng:
+    # These are usually set by grains in map.jinja
+    lookup:
+      package: nginx-custom
+      service: nginx
+      webuser: www-data
+      conf_file: /etc/nginx/nginx.conf
+      vhost_available: /etc/nginx/sites-available
+      vhost_enabled: /etc/nginx/sites-enabled
+      vhost_use_symlink: True
 
-  # Source compilation is not currently a part of nginx.ng
-  from_source: False
+    # Source compilation is not currently a part of nginx.ng
+    from_source: False
 
-  package:
-    opts: {} # this partially exposes parameters of pkg.installed
+    package:
+      opts: {} # this partially exposes parameters of pkg.installed
 
-  service:
-    enable: True # Whether or not the service will be enabled/running or dead
-    opts: {} # this partially exposes parameters of service.running / service.dead
+    service:
+      enable: True # Whether or not the service will be enabled/running or dead
+      opts: {} # this partially exposes parameters of service.running / service.dead
 
-  server:
-    opts: {} # this partially exposes file.managed parameters as they relate to the main nginx.conf file
+    server:
+      opts: {} # this partially exposes file.managed parameters as they relate to the main nginx.conf file
 
-    # nginx.conf (main server) declarations
-    # dictionaries map to blocks {} and lists cause the same declaration to repeat with different values
-    config: 
-      worker_processes: 4
-      pid: /run/nginx.pid
-      events:
-        worker_connections: 768
-      http:
-        sendfile: on
-        include:
-          - /etc/nginx/mime.types
-          - /etc/nginx/conf.d/*.conf
+      # nginx.conf (main server) declarations
+      # dictionaries map to blocks {} and lists cause the same declaration to repeat with different values
+      config: 
+        worker_processes: 4
+        pid: /run/nginx.pid
+        events:
+          worker_connections: 768
+        http:
+          sendfile: on
+          include:
+            - /etc/nginx/mime.types
+            - /etc/nginx/conf.d/*.conf
 
-  vhosts:
-    disabled_postfix: .disabled # a postfix appended to files when doing non-symlink disabling
-    symlink_opts: {} # partially exposes file.symlink params when symlinking enabled sites
-    rename_opts: {} # partially exposes file.rename params when not symlinking disabled/enabled sites
-    managed_opts: {} # partially exposes file.managed params for managed vhost files
-    dir_opts: {} # partially exposes file.directory params for site available/enabled dirs
+    vhosts:
+      disabled_postfix: .disabled # a postfix appended to files when doing non-symlink disabling
+      symlink_opts: {} # partially exposes file.symlink params when symlinking enabled sites
+      rename_opts: {} # partially exposes file.rename params when not symlinking disabled/enabled sites
+      managed_opts: {} # partially exposes file.managed params for managed vhost files
+      dir_opts: {} # partially exposes file.directory params for site available/enabled dirs
 
-    # vhost declarations
-    # vhosts will default to being placed in vhost_available
-    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
-        disabled_name: mysite.aint_on # an alternative disabled name to be use when not symlinking
-        enabled: True
-        config: [] # May be a list or None, if None, no vhost file will be managed/templated
+      # vhost declarations
+      # vhosts will default to being placed in vhost_available
+      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
+          disabled_name: mysite.aint_on # an alternative disabled name to be use when not symlinking
+          enabled: True
+          
+          # May be a list of config options or None, if None, no vhost file will be managed/templated
+          # Take server directives as lists of dictionaries. If the dictionary value is another list of
+          # dictionaries a block {} will be started with the dictionary key name
+          config:
+            - server:
+              - server_name: localhost
+              - listen: 
+                - 80
+                - default_server
+              - index:
+                - index.html
+                - index.htm
+              - location ~ .htm:
+                - try_files:
+                  - $uri
+                  - $uri/ =404
+                - test: something else
+                
+          # The above outputs:
+          # server {
+          #    server_name localhost;
+          #    listen 80 default_server;
+          #    index index.html index.htm;
+          #    location ~ .htm {
+          #        try_files $uri $uri/ =404;
+          #        test something else;
+          #    }
+          # }