[mod] roles:vikunja-and-nginx:tls mode

roles/vikunja-and-nginx/defaults/main.json

@@ -1,3 +1,4 @@
 {
-	"var_vikunja_and_nginx_domain": "vikunja.example.org"
+	"var_vikunja_and_nginx_domain": "vikunja.example.org",
+	"var_vikunja_and_nginx_tls_mode": "enable"
 }

roles/vikunja-and-nginx/templates/conf.j2

@@ -1,17 +1,34 @@
-server {
-	listen 80;
-	listen [::]:80;
-	listen 443 ssl;
-	listen [::]:443 ssl;
-	
-	server_name {{var_vikunja_and_nginx_domain}};
-	
-	ssl_certificate /etc/ssl/fullchains/{{var_vikunja_and_nginx_domain}}.pem;
-	ssl_certificate_key /etc/ssl/private/{{var_vikunja_and_nginx_domain}}.pem;
-	include /etc/nginx/ssl-hardening.conf;
-	
+{% macro vikunja_common() %}
 	location / {
 		proxy_pass http://localhost:3456;
 		client_max_body_size 20M;
 	}
+{% endif %}
+
+server {
+	server_name {{var_vikunja_and_nginx_domain}};
+	
+	listen 80;
+	listen [::]:80;
+	
+{% if (var_vikunja_and_nginx_tls_mode == "force") %}
+	return 301 https://$http_host$request_uri;
+{% else %}
+	{{ vikunja_common() }}
+{% endif %}
 }
+
+{% if (var_element_and_nginx_tls_mode != "disable") %}
+server {
+	server_name {{var_vikunja_and_nginx_domain}};
+	
+	listen 443 ssl http2;
+	listen [::]:443 ssl http2;
+	
+	ssl_certificate_key /etc/ssl/private/{{var_vikunja_and_nginx_domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{var_vikunja_and_nginx_domain}}.pem;
+	include /etc/nginx/ssl-hardening.conf;
+	
+	{{ vikunja_common() }}
+}
+{% endif %}

roles/vikunja-and-nginx/vardef.json

@@ -0,0 +1,15 @@
+{
+	"domain": {
+		"type": "string",
+		"mandatory": false
+	},
+	"tls_mode": {
+        "type": "string",
+        "options": [
+			"disable",
+			"enable",
+			"force"
+        ],
+        "mandatory": false
+	}
+}