angie: adjust/fix default configuration

angie/j2cfg.dist/00-defaults.yml.j2

@@ -20,28 +20,26 @@ compress_types:
 - text/xml
 
 request_headers:
+  ## '$req_connection' is defined in /angie/autoconf.dist/http-request-headers-basic.conf.j2
+  Connection: '$req_connection'
+  Upgrade: '$http_upgrade'
+  Early-Data: '$ssl_early_data'
 {% if env.NGX_HTTP_TRANSPARENT_PROXY == '0' %}
   Host: '$proxy_host'
   X-Real-IP: '$remote_addr'
   ## '$proxy_add_forwarded' is defined in /angie/autoconf.dist/http-request-headers-forwarded.conf
   Forwarded: '$proxy_add_forwarded'
+  ## do not pass Accept-Encoding to backend
+  Accept-Encoding: ""
+  ## '$req_accept' is defined in /angie/autoconf.dist/http-request-headers-basic.conf.j2
+  Accept: '$req_accept'
+  ## '$req_user_agent' is defined in /angie/autoconf.dist/http-request-headers-basic.conf.j2
+  User-Agent: '$req_user_agent'
 {% elif env.NGX_HTTP_TRANSPARENT_PROXY == '1' %}
   Host: '$host'
   X-Real-IP: ''
   Forwarded: ''
 {% endif %}
-
-request_headers:
-  ## do not pass Accept-Encoding to backend
-  Accept-Encoding: ""
-  ## '$req_accept' is defined in /angie/autoconf.dist/http-request-headers-basic.conf.j2
-  Accept: '$req_accept'
-  ## '$req_connection' is defined in /angie/autoconf.dist/http-request-headers-basic.conf.j2
-  Connection: '$req_connection'
-  Upgrade: '$http_upgrade'
-  Early-Data: '$ssl_early_data'
-  ## '$req_user_agent' is defined in /angie/autoconf.dist/http-request-headers-basic.conf.j2
-  User-Agent: '$req_user_agent'
 {% if env.NGX_HTTP_X_FORWARDED == 'pass' %}
   X-Forwarded-Proto: '$scheme'
   X-Forwarded-Host: '$host'