summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-08-19 17:39:48 +0200
committerChristian Pointner <equinox@spreadspace.org>2022-08-19 17:39:48 +0200
commite7a00195fcd1113f3fd69698582a0ee8a7b5b8a4 (patch)
tree5d5a38142bce76bdc9caf20b1b13c6374c3d09f2
parentsk-cloudio: next instances have been upgraded by dan (diff)
remove old nginx vhost templates
-rw-r--r--roles/nginx/vhost/templates/generic-proxy-no-buffering-with-acme.conf.j255
-rw-r--r--roles/nginx/vhost/templates/generic-proxy-no-buffering.conf.j237
-rw-r--r--roles/nginx/vhost/templates/static-files-with-acme.conf.j250
3 files changed, 0 insertions, 142 deletions
diff --git a/roles/nginx/vhost/templates/generic-proxy-no-buffering-with-acme.conf.j2 b/roles/nginx/vhost/templates/generic-proxy-no-buffering-with-acme.conf.j2
deleted file mode 100644
index fe6cb70b..00000000
--- a/roles/nginx/vhost/templates/generic-proxy-no-buffering-with-acme.conf.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-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(' ') }};
-
- 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;
-
-{% if 'extra_directives' in nginx_vhost %}
- {{ nginx_vhost.extra_directives | indent(4) }}
-
-{% endif %}
-{% for path, location in nginx_vhost.locations.items() %}
- location {{ path }} {
- 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 %}
-{% if 'extra_directives' in location %}
-
- {{ location.extra_directives | indent(8) }}
-{% endif %}
- }
-{% endfor %}
-}
diff --git a/roles/nginx/vhost/templates/generic-proxy-no-buffering.conf.j2 b/roles/nginx/vhost/templates/generic-proxy-no-buffering.conf.j2
deleted file mode 100644
index 665c9d77..00000000
--- a/roles/nginx/vhost/templates/generic-proxy-no-buffering.conf.j2
+++ /dev/null
@@ -1,37 +0,0 @@
-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 'extra_directives' in nginx_vhost %}
- {{ nginx_vhost.extra_directives | indent(4) }}
-
-{% endif %}
-{% for path, location in nginx_vhost.locations.items() %}
- location {{ path }} {
- 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 %}
-{% if 'extra_directives' in location %}
-
- {{ location.extra_directives | indent(8) }}
-{% endif %}
- }
-{% endfor %}
-}
diff --git a/roles/nginx/vhost/templates/static-files-with-acme.conf.j2 b/roles/nginx/vhost/templates/static-files-with-acme.conf.j2
deleted file mode 100644
index cf1f511a..00000000
--- a/roles/nginx/vhost/templates/static-files-with-acme.conf.j2
+++ /dev/null
@@ -1,50 +0,0 @@
-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(' ') }};
-
- 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;
-
-{% if 'extra_directives' in nginx_vhost %}
- {{ nginx_vhost.extra_directives | indent(4) }}
-
-{% endif %}
-{% for path, location in nginx_vhost.locations.items() %}
- location {{ path }} {
-{% 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 %}
-{% if 'extra_directives' in location %}
-
- {{ location.extra_directives | indent(8) }}
-{% endif %}
- }
-{% endfor %}
-}