fix(config): modify template to parse multi-level blocks correctly

Author: javierbertoli

caddy/files/default/Caddyfile.tmpl.jinja

@@ -7,16 +7,14 @@
             {%- for k, v in value.items() -%}
                 {%- if v is number or v is string -%}
 {{ server_config([v], k, ind) }}
-                {%- elif v|length() > 0 and (v[0] is number or v[0] is string) -%}
-{{ server_config(v, k, ind) }}
-                {%- else -%}
+                {%- elif v is iterable and v is not string -%}
 {{ '\t' * ind }}{{ k }}{{ operator }}{{ '{' }}
 {{ server_config(v, ind = ind + ind_increment) }}
 {{- '\t' * ind }}{{ '}' }}{{ lb }}
+                {%- elif value is iterable and value is not string -%}
+{{ server_config(value, key, ind + ind_increment) }}
                 {%- endif -%}
             {%- endfor -%}
-        {%- elif value is iterable -%}
-{{ server_config(value, key, ind + ind_increment) }}
         {%- endif -%}
     {%- endfor -%}
 {%- endmacro -%}
@@ -32,4 +30,4 @@
 }
 # Vhosts
 # https://caddyserver.com/docs/caddyfile
-{{ server_config(caddy['servers']) }}
+{{ server_config(caddy['servers']) }}

test/integration/default/controls/config.rb

@@ -13,9 +13,9 @@
         'File managed by Salt at <salt://caddy/files/default/Caddyfile.tmpl.jinja>'
       )
     end
+    # rubocop:disable Lint/RedundantCopDisableDirective
+    # rubocop:disable Layout/LineLength
     its('content') do
-      # rubocop:disable Lint/RedundantCopDisableDirective
-      # rubocop:disable Layout/LineLength
       should match(
         "{\n"\
         "\temail webmaster@example.net\n"\
@@ -48,6 +48,7 @@
     its('content') do
       should match(
         "example.net {\n"\
+        "\tencode gzip\n"\
         "\thandle_path /\\* {\n"\
         "\t\troot \\* /var/www/example.net/\n"\
         "\t\tfile_server\n"\
@@ -58,8 +59,36 @@
         "\t}\n"\
         '}'
       )
-      # rubocop:enable Layout/LineLength
-      # rubocop:enable Lint/RedundantCopDisableDirective
     end
+    its('content') do
+      should match(
+        "multi.level.example.net {\n"\
+        "\tencode gzip\n"\
+        "\troute /path/\\* {\n"\
+        "\t\tbasicauth \\* {\n"\
+        "\t\t\tuser JDJhJDE0JFJxLjBBTXhVTHF2VHBoVU54LjFXQnVEQkZYdFhlVmUzSmxRL3VrQVcwS05IQnVIS2FBREIy\n"\
+        "\t\t}\n"\
+        "\t\troot \\* /var/www/html/\n"\
+        "\t\ttry_files {path} /path/to/index.cgi\n"\
+        "\t\t@cgi path \\*.cgi\n"\
+        "\t\thandle /path/to/index.cgi {\n"\
+        "\t\t\treverse_proxy @cgi unix//run/fcgiwrap.socket {\n"\
+        "\t\t\t\ttransport fastcgi {\n"\
+        "\t\t\t\t\tresolve_root_symlink\n"\
+        "\t\t\t\t\tsplit .cgi\n"\
+        "\t\t\t\t}\n"\
+        "\t\t\t}\n"\
+        "\t\t}\n"\
+        "\t\tfile_server\n"\
+        "\t}\n"\
+        "\tlog {\n"\
+        "\t\tlevel WARN\n"\
+        "\t\toutput file /var/log/caddy/multi.level.example.net.log\n"\
+        "\t}\n"\
+        '}'
+      )
+    end
+    # rubocop:enable Layout/LineLength
+    # rubocop:enable Lint/RedundantCopDisableDirective
   end
 end

test/salt/pillar/default.sls

@@ -13,8 +13,6 @@ caddy:
   config:
     dir: /etc/caddy
     file: Caddyfile
-    validate: true
-    format: true
     global_options:
       - email: webmaster@example.net
       - auto_https: 'off'
@@ -23,7 +21,6 @@ caddy:
         - output: file /var/log/caddy/caddy-general.log
   service:
     name: caddy
-  xcaddy: {}
   servers:
     - localhost:
       - root: '* /usr/share/caddy'
@@ -33,9 +30,27 @@ caddy:
     - 'example.com:80':
         - redir: 'https://example.net'
     - example.net:
+      - encode: gzip
       - 'handle_path /*':
           - root: '* /var/www/example.net/'
           - file_server
       - log:
         - level: WARN
         - output: file /var/log/caddy/example.net.log
+    - multi.level.example.net:
+      - encode: gzip
+      - 'route /path/*':
+        - 'basicauth *':
+          - user: JDJhJDE0JFJxLjBBTXhVTHF2VHBoVU54LjFXQnVEQkZYdFhlVmUzSmxRL3VrQVcwS05IQnVIS2FBREIy
+        - root: '* /var/www/html/'
+        - try_files: '{path} /path/to/index.cgi'
+        - '@cgi': 'path *.cgi'
+        - handle /path/to/index.cgi:
+          - reverse_proxy @cgi unix//run/fcgiwrap.socket:
+            - transport fastcgi:
+              - resolve_root_symlink
+              - split: .cgi
+        - file_server
+      - log:
+        - level: WARN
+        - output: file /var/log/caddy/multi.level.example.net.log