nginx/vhost: combine templates to one generic version

2 files changed, 83 insertions, 7 deletions

diff --git a/roles/nginx/vhost/defaults/main.yml b/roles/nginx/vhost/defaults/main.yml
index 233015be..b80a5442 100644
--- a/roles/nginx/vhost/defaults/main.yml
+++ b/roles/nginx/vhost/defaults/main.yml
@@ -2,7 +2,7 @@
 # nginx_vhost:
 #   default: yes
 #   name: example
-#   template: generic-proxy-no-buffering-with-acme
+#   template: generic
 #   acme: yes
 #   hostnames:
 #   - example.com
@@ -24,12 +24,8 @@
 #         trusted_certificate: /path/to/ca.pem
 
 # nginx_vhost:
-#   name: other-example
-#   content: "<<< content of vhost >>>"
-
-# nginx_vhost:
-#   name: static
-#   template: static-files-with-acme
+#   name: mixed-static-and-proxy
+#   template: generic
 #   acme: yes
 #   hostnames:
 #   - static.example.com
@@ -45,3 +41,9 @@
 #         add_header X-Example-Header "foo";
 #     '/subdir/':
 #       alias: /srv/www/foo
+#     '/foo/':
+#       proxy_pass: http://127.0.0.1:1234
+
+# nginx_vhost:
+#   name: other-example
+#   content: "<<< content of vhost >>>"
diff --git a/roles/nginx/vhost/templates/generic.conf.j2 b/roles/nginx/vhost/templates/generic.conf.j2
new file mode 100644
index 00000000..08bf7a60
--- /dev/null
+++ b/roles/nginx/vhost/templates/generic.conf.j2
@@ -0,0 +1,74 @@
+server {
+    listen 80{% if 'default' in nginx_vhost and nginx_vhost.default %} default_server{% endif %};
+    listen [::]:80{% if 'default' in nginx_vhost and nginx_vhost.default %} default_server{% endif %};
+    server_name {{ nginx_vhost.hostnames | join(' ') }};
+
+{% if 'acme' in nginx_vhost and nginx_vhost.acme %}
+    include snippets/acmetool.conf;
+
+    location / {
+        return 301 https://$host$request_uri;
+    }
+}
+
+server {
+    listen 443 ssl http2{% if 'default' in nginx_vhost and nginx_vhost.default %} default_server{% endif %};
+    listen [::]:443 ssl http2{% if 'default' in nginx_vhost and nginx_vhost.default %} default_server{% endif %};
+    server_name {{ nginx_vhost.hostnames | join(' ') }};
+
+    include snippets/acmetool.conf;
+    include snippets/tls{% if 'tls_variant' in nginx_vhost %}-{{ nginx_vhost.tls_variant }}{% endif %}.conf;
+    ssl_certificate     /var/lib/acme/live/{{ nginx_vhost.hostnames[0] }}/fullchain;
+    ssl_certificate_key /var/lib/acme/live/{{ nginx_vhost.hostnames[0] }}/privkey;
+    include snippets/hsts.conf;
+
+{% endif %}
+{% if 'extra_directives' in nginx_vhost %}
+    {{ nginx_vhost.extra_directives | indent(4) }}
+
+{% endif %}
+{% for path, location in nginx_vhost.locations.items() %}
+    location {{ path }} {
+{%   if 'proxy_pass' in location %}
+        include snippets/proxy-nobuff.conf;
+        proxy_set_header Host $host;
+        include snippets/proxy-forward-headers.conf;
+
+        # for websockets
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+
+        proxy_pass {{ location.proxy_pass }};
+{%     if 'proxy_redirect' in location %}
+{%       for entry in location.proxy_redirect %}
+        proxy_redirect {{ entry.redirect }} {{ entry.replacement }};
+{%       endfor %}
+{%     endif %}
+{%     if 'proxy_ssl' in location %}
+{%       for prop in (location.proxy_ssl | list | sort)  %}
+        proxy_ssl_{{ prop }} {{ location.proxy_ssl[prop] }};
+{%       endfor %}
+{%     endif %}
+{%   else %}
+{%     if 'root' in location %}
+        root {{ location.root }};
+{%     elif 'alias' in location %}
+        alias {{ location.alias }};
+{%     endif %}
+{%     if 'index' in location %}
+        index {{ location.index }};
+{%     endif %}
+{%     if 'autoindex' in location %}
+        autoindex on;
+{%       if 'format' in location.autoindex %}
+        autoindex_format {{ nginx_vhost.autoindex.format }};
+{%       endif  %}
+{%     endif %}
+{%   endif %}
+{%   if 'extra_directives' in location %}
+
+        {{ location.extra_directives | indent(8) }}
+{%   endif %}
+    }
+{% endfor %}
+}