summaryrefslogtreecommitdiff
path: root/data/templates/https
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-04-11 06:01:43 +0200
committerChristian Poessinger <christian@poessinger.com>2022-04-11 06:01:43 +0200
commit679415a515d126e901703ea1288f7976ee675ab3 (patch)
treeccdd11a35bc276c22e7d9e2a056b62a3c98be9a5 /data/templates/https
parent4dc4bbc6ce6ab4a3a531b16619b5c34816366afc (diff)
downloadvyos-1x-679415a515d126e901703ea1288f7976ee675ab3.tar.gz
vyos-1x-679415a515d126e901703ea1288f7976ee675ab3.zip
Revert "https: T4333: migrate to new vyos_defined Jinja2 test"
This reverts commit 77bbf766e8023e73df1c3c1360f607a4d94727fd.
Diffstat (limited to 'data/templates/https')
-rw-r--r--data/templates/https/nginx.default.tmpl34
-rw-r--r--data/templates/https/override.conf.tmpl2
-rw-r--r--data/templates/https/vyos-http-api.service.tmpl4
3 files changed, 22 insertions, 18 deletions
diff --git a/data/templates/https/nginx.default.tmpl b/data/templates/https/nginx.default.tmpl
index 73ab88aae..a51505270 100644
--- a/data/templates/https/nginx.default.tmpl
+++ b/data/templates/https/nginx.default.tmpl
@@ -4,52 +4,56 @@
{% for server in server_block_list %}
server {
+
# SSL configuration
#
-{% if server.address is vyos_defined('*') %}
+{% if server.address == '*' %}
listen {{ server.port }} ssl;
listen [::]:{{ server.port }} ssl;
-{% else %}
+{% else %}
listen {{ server.address | bracketize_ipv6 }}:{{ server.port }} ssl;
-{% endif %}
+{% endif %}
-{% for name in server.name %}
+{% for name in server.name %}
server_name {{ name }};
-{% endfor %}
+{% endfor %}
-{% if server.certbot is vyos_defined %}
+{% if server.certbot %}
ssl_certificate {{ server.certbot_dir }}/live/{{ server.certbot_domain_dir }}/fullchain.pem;
ssl_certificate_key {{ server.certbot_dir }}/live/{{ server.certbot_domain_dir }}/privkey.pem;
include {{ server.certbot_dir }}/options-ssl-nginx.conf;
ssl_dhparam {{ server.certbot_dir }}/ssl-dhparams.pem;
-{% elif server.vyos_cert is vyos_defined %}
+{% elif server.vyos_cert %}
ssl_certificate {{ server.vyos_cert.crt }};
ssl_certificate_key {{ server.vyos_cert.key }};
-{% else %}
+{% else %}
#
# Self signed certs generated by the ssl-cert package
# Don't use them in a production server!
#
include snippets/snakeoil.conf;
-{% endif %}
+{% endif %}
ssl_protocols TLSv1.2 TLSv1.3;
# proxy settings for HTTP API, if enabled; 503, if not
location ~ /(retrieve|configure|config-file|image|generate|show|docs|openapi.json|redoc|graphql) {
-{% if server.api is vyos_defined %}
-{% if server.api.socket is vyos_defined %}
+{% if server.api %}
+{% if server.api.socket %}
proxy_pass http://unix:/run/api.sock;
-{% else %}
+{% else %}
proxy_pass http://localhost:{{ server.api.port }};
-{% endif %}
+{% endif %}
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 600;
proxy_buffering off;
-{% else %}
+{% else %}
return 503;
-{% endif %}
+{% endif %}
}
+
error_page 497 =301 https://$host:{{ server.port }}$request_uri;
+
}
+
{% endfor %}
diff --git a/data/templates/https/override.conf.tmpl b/data/templates/https/override.conf.tmpl
index 1760a5ff3..824b1ba3b 100644
--- a/data/templates/https/override.conf.tmpl
+++ b/data/templates/https/override.conf.tmpl
@@ -1,4 +1,4 @@
-{% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' ' if vrf is vyos_defined else '' %}
+{% set vrf_command = 'ip vrf exec ' + vrf + ' ' if vrf is defined else '' %}
[Unit]
StartLimitIntervalSec=0
After=vyos-router.service
diff --git a/data/templates/https/vyos-http-api.service.tmpl b/data/templates/https/vyos-http-api.service.tmpl
index fb424e06c..15bd80d65 100644
--- a/data/templates/https/vyos-http-api.service.tmpl
+++ b/data/templates/https/vyos-http-api.service.tmpl
@@ -1,11 +1,11 @@
-{% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' ' if vrf is vyos_defined else '' %}
+{% set vrf_command = 'ip vrf exec ' + vrf + ' ' if vrf is defined else '' %}
[Unit]
Description=VyOS HTTP API service
After=vyos-router.service
Requires=vyos-router.service
[Service]
-ExecStart={{ vrf_command }}/usr/libexec/vyos/services/vyos-http-api-server
+ExecStart={{vrf_command}}/usr/libexec/vyos/services/vyos-http-api-server
Type=idle
SyslogIdentifier=vyos-http-api