From 3db6eadd831c84edc5de6375918f214c38b6462f Mon Sep 17 00:00:00 2001
From: root <root@triton.fet.htu.tuwien.ac.at>
Date: Tue, 12 May 2020 11:33:53 +0200
Subject: [PATCH] Add labor and protect alt.fet.at behind LDAP

---
 fet.at/alt.conf       | 2 ++
 fet.at/default.conf   | 3 +++
 triton.fet.at/wp.conf | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fet.at/alt.conf b/fet.at/alt.conf
index 3e76a04..0fea60d 100644
--- a/fet.at/alt.conf
+++ b/fet.at/alt.conf
@@ -38,6 +38,8 @@ server {
     ssl_trusted_certificate /etc/letsencrypt/live/www.alt.fet.at/chain.pem;
     include snippets/ssl.conf;
 
+    include snippets/ldap.conf;
+
     location = / {
         return 301 https://$host/twiki/bin/view/Homepage;
     }
diff --git a/fet.at/default.conf b/fet.at/default.conf
index 2e6fe77..27a5ce0 100644
--- a/fet.at/default.conf
+++ b/fet.at/default.conf
@@ -54,4 +54,7 @@ server {
     location ~ ^/(alt|twiki) {
         return 302 https://www.alt.fet.at$request_uri;
     }
+    location ~ ^/(labor) {
+        return 302 https://www.fet.at/themen/8;
+    }
 }
diff --git a/triton.fet.at/wp.conf b/triton.fet.at/wp.conf
index dbab6a0..d4e7435 100644
--- a/triton.fet.at/wp.conf
+++ b/triton.fet.at/wp.conf
@@ -1,7 +1,7 @@
 # -*-nginx-*-
 server {
     listen 80;
-    server_name wp.triton.fet.at;
+    server_name wp.triton.fet.at www.wp.triton.fet.at;
 
     include snippets/letsencrypt.conf;
 }