From 802673c9965a4add86f1743e03f94c591be8b2af Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Fri, 10 Nov 2017 13:45:24 +0100
Subject: [PATCH] add acmetool handling to nginx config
---
request-tracker/defaults/main.yml | 2 ++
request-tracker/templates/nginx-rt.j2 | 16 +++++++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 request-tracker/defaults/main.yml
diff --git a/request-tracker/defaults/main.yml b/request-tracker/defaults/main.yml
new file mode 100644
index 0000000..7bae692
--- /dev/null
+++ b/request-tracker/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+rt_enable_acmetool: False
diff --git a/request-tracker/templates/nginx-rt.j2 b/request-tracker/templates/nginx-rt.j2
index 8863f5d..f465bb6 100644
--- a/request-tracker/templates/nginx-rt.j2
+++ b/request-tracker/templates/nginx-rt.j2
@@ -39,10 +39,24 @@ server {
fastcgi_param SERVER_NAME $server_name;
fastcgi_pass unix:///var/run/rt4-fcgi.sock;
}
+ {% if rt_enable_acmetool %}
+ location /.well-known/acme-challenge {
+ alias /var/lib/acme/webroot;
+ try_files $uri =404;
+ }
+ {% endif %}
}
server {
listen 80;
server_name {{rt_webdomain}};
- return 301 https://$server_name$request_uri;
+ {% if rt_enable_acmetool %}
+ location /.well-known/acme-challenge {
+ alias /var/lib/acme/webroot;
+ try_files $uri =404;
+ }
+ {% endif %}
+ location / {
+ return 301 https://$server_name$request_uri;
+ }
}
--
GitLab