fix whitespace in templates

Author: oxyc

provisioning/templates/drupalvm-local.aliases.drushrc.php.j2

@@ -6,15 +6,15 @@
  * @see example.aliases.drushrc.php.
  */
 
-{% macro alias(host, root) %}
+{% macro alias(host, root) -%}
 {%- if root not in _devtool_docroots %}
 $aliases['{{ host }}'] = array(
   'uri' => '{{ host }}',
   'root' => '{{ root }}',
 );
 
 {% endif -%}
-{% endmacro %}
+{% endmacro -%}
 
 {% block aliases -%}
 {%- if drupalvm_webserver == 'apache' -%}
@@ -33,4 +33,4 @@ $aliases['{{ host }}'] = array(
     {%- endfor -%}
   {%- endfor -%}
 {%- endif -%}
-{% endblock %}
+{%- endblock %}

provisioning/templates/drupalvm.aliases.drushrc.php.j2

@@ -6,7 +6,7 @@
  * @see example.aliases.drushrc.php.
  */
 
-{% macro alias(host, root) %}
+{% macro alias(host, root) -%}
 {%- if root not in _devtool_docroots %}
 $aliases['{{ host }}'] = array(
   'uri' => '{{ host }}',
@@ -20,7 +20,7 @@ $aliases['{{ host }}'] = array(
 );
 
 {% endif -%}
-{% endmacro %}
+{% endmacro -%}
 
 {% block aliases -%}
 {%- if drupalvm_webserver == 'apache' -%}
@@ -39,4 +39,4 @@ $aliases['{{ host }}'] = array(
     {%- endfor -%}
   {%- endfor -%}
 {%- endif -%}
-{% endblock %}
+{%- endblock %}

provisioning/templates/drupalvm.vcl.j2

@@ -11,13 +11,15 @@ backend default {
     .port = "{{ varnish_default_backend_port }}";
     .first_byte_timeout = 300s;
     {% endblock %}
+
 }
 
 # Access control list for PURGE requests.
 acl purge {
     {% block acl_purge -%}
     "127.0.0.1";
     {% endblock %}
+
 }
 
 # Respond to incoming requests.
@@ -124,6 +126,7 @@ sub vcl_recv {
         }
     }
     {% endblock %}
+
 }
 
 # Set a header to track a cache HITs and MISSes.
@@ -141,6 +144,7 @@ sub vcl_deliver {
         set resp.http.X-Varnish-Cache = "MISS";
     }
     {% endblock %}
+
 }
 
 # Instruct Varnish what to do in the case of certain backend responses (beresp).
@@ -172,4 +176,5 @@ sub vcl_backend_response {
     # Allow items to remain in cache up to 6 hours past their cache expiration.
     set beresp.grace = 6h;
     {% endblock %}
+
 }

provisioning/templates/nginx-vhost.conf.j2

@@ -1,5 +1,5 @@
-{% block server_redirect %}
-{% if item.server_name_redirect is defined %}
+{% block server_redirect -%}
+{% if item.server_name_redirect is defined -%}
 server {
     listen       80;
     server_name  {{ item.server_name_redirect }};
@@ -9,7 +9,7 @@ server {
 {% endblock %}
 
 server {
-    {% block server_begin %}{% endblock %}
+    {% block server_begin -%}{% endblock %}
 
     {% block server_basic -%}
     listen {{ item.listen | default('80') }};
@@ -19,9 +19,9 @@ server {
     {% endblock %}
 
     {% block server_logs -%}
-    {% if item.access_log is defined -%}
+    {%- if item.access_log is defined -%}
     access_log {{ item.access_log }};
-    {% endif %}
+    {%- endif -%}
     error_log {{ item.error_log|default('/var/log/nginx/error.log') }} info;
     {% endblock %}
 
@@ -45,7 +45,7 @@ server {
     {% endblock %}
 
     {% block location_drupal_legacy -%}
-    {% if drupal_major_version == 8 %}
+    {% if drupal_major_version == 8 -%}
     # Redirect common PHP files to their new locations.
     location ~ ^((?!.*(?:core)).*)/(install.php|rebuild.php) {
          return 301 $scheme://$host$1/core/$2$is_args$args;
@@ -128,9 +128,9 @@ server {
     gzip_min_length 512;
     {% endblock %}
 
-    {% block server_end %}{% endblock %}
+    {% block server_end -%}{% endblock %}
 
-{% if item.extra_parameters is defined %}
+{% if item.extra_parameters is defined -%}
     {{ item.extra_parameters|indent(4) }}
-{% endif %}
+{%- endif %}
 }