Sort listen options by IP and port (#12)

Author: StudioMaX

molecule/common/playbooks/default_converge.yml

@@ -72,6 +72,23 @@
                     port: 80
                     opts:
                       - default_server
+                  listen_localhost_https:
+                    ip: 0.0.0.0
+                    port: 443
+                    ssl: false
+                    opts:
+                      - default_server
+                  listen_localhost_ipv6:
+                    ip: "[::]"
+                    port: 80
+                    opts:
+                      - default_server
+                  listen_localhost_ipv6_https:
+                    ip: "[::]"
+                    port: 443
+                    ssl: false
+                    opts:
+                      - default_server
                 server_name: localhost
                 http_error_pages:
                   404: /404.html

templates/http/default.conf.j2

@@ -79,8 +79,8 @@ auth_request_set {{ item.value.auth_request_set_http.name }} {{ item.value.auth_
 {% if item.value.servers is defined %}
 {% for server in item.value.servers %}
 server {
-{% for listen in item.value.servers[server].listen %}
-    listen {% if item.value.servers[server].listen[listen].ip is defined and item.value.servers[server].listen[listen].ip | length %}{{ item.value.servers[server].listen[listen].ip }}:{% endif %}{{ item.value.servers[server].listen[listen].port }}{% if item.value.servers[server].listen[listen].ssl is defined and item.value.servers[server].listen[listen].ssl %} ssl{% endif %}{% if item.value.servers[server].listen[listen].opts is defined and item.value.servers[server].listen[listen].opts | length %} {{ item.value.servers[server].listen[listen].opts | join(" ") }}{% endif %};
+{% for listen in (item.value.servers[server].listen.values() | rejectattr("ip", "defined") | sort(attribute='port') + item.value.servers[server].listen.values() | rejectattr("ip", "undefined") | sort(attribute='port') | sort(attribute='ip')) %}
+    listen {% if listen.ip is defined and listen.ip | length %}{{ listen.ip }}:{% endif %}{{ listen.port }}{% if listen.ssl is defined and listen.ssl %} ssl{% endif %}{% if listen.opts is defined and listen.opts | length %} {{ listen.opts | join(" ") }}{% endif %};
 {% endfor %}
     server_name {{ item.value.servers[server].server_name | default('localhost') }};
 {% if item.value.servers[server].ssl is defined and item.value.servers[server].ssl %}

templates/stream/default.conf.j2

@@ -33,8 +33,8 @@ upstream {{ item.value.upstreams[upstream].name }} {
 {% if item.value.network_streams is defined %}
 {% for stream in item.value.network_streams %}
 server {
-{% for listen in item.value.network_streams[stream].listen %}
-    listen {% if item.value.network_streams[stream].listen[listen].ip is defined and item.value.network_streams[stream].listen[listen].ip | length %}{{ item.value.network_streams[stream].listen[listen].ip }}:{% endif %}{{ item.value.network_streams[stream].listen[listen].port }}{% if item.value.network_streams[stream].listen[listen].ssl is defined and item.value.network_streams[stream].listen[listen].ssl %} ssl{% endif %}{% if item.value.network_streams[stream].listen[listen].opts is defined and item.value.network_streams[stream].listen[listen].opts | length %} {{ item.value.network_streams[stream].listen[listen].opts | join(" ") }}{% endif %};
+{% for listen in (item.value.network_streams[stream].listen.values() | rejectattr("ip", "defined") | sort(attribute='port') + item.value.network_streams[stream].listen.values() | rejectattr("ip", "undefined") | sort(attribute='port') | sort(attribute='ip')) %}
+    listen {% if listen.ip is defined and listen.ip | length %}{{ listen.ip }}:{% endif %}{{ listen.port }}{% if listen.ssl is defined and listen.ssl %} ssl{% endif %}{% if listen.opts is defined and listen.opts | length %} {{ listen.opts | join(" ") }}{% endif %};
 {% endfor %}
 {% if item.value.network_streams[stream].ssl is defined and item.value.network_streams[stream].ssl %}
     ssl_certificate {{ item.value.network_streams[stream].ssl.cert }};