From 76f39e07b91ad3d96f43aca35cae0d9fd5a3404d Mon Sep 17 00:00:00 2001
From: andis <andis@fet.at>
Date: Tue, 31 May 2022 20:26:54 +0200
Subject: [PATCH] fix ldap1

---
 conf.d/andis/nginx.fet.at                    | 11 -----------
 conf.d/default.conf                          |  8 ++++++--
 conf.d/fet.at/{juri.conf => infoscreen.conf} |  7 ++++---
 conf.d/fet.at/instagram.fet.at               | 11 +++++++++++
 4 files changed, 21 insertions(+), 16 deletions(-)
 delete mode 100644 conf.d/andis/nginx.fet.at
 rename conf.d/fet.at/{juri.conf => infoscreen.conf} (62%)
 create mode 100644 conf.d/fet.at/instagram.fet.at

diff --git a/conf.d/andis/nginx.fet.at b/conf.d/andis/nginx.fet.at
deleted file mode 100644
index c20be90..0000000
--- a/conf.d/andis/nginx.fet.at
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-server {
-    listen 443 ssl ;
-    server_name dev.nginx.fet.at;
-    include ssl.conf;
-    include ldap.conf;
-    set $proxy_host devnginx_theia_1;
-    set $proxy_port 3000;
-    include internal_proxy.conf;
-}
\ No newline at end of file
diff --git a/conf.d/default.conf b/conf.d/default.conf
index 7a1391d..73d15e7 100644
--- a/conf.d/default.conf
+++ b/conf.d/default.conf
@@ -1,6 +1,10 @@
 server {
     listen 80 default_server;
-    include auto_ssl.conf;
+    location ^~ /.well-known/acme-challenge/ {
+      content_by_lua_block {
+        auto_ssl:challenge_server()
+      }
+    }
     location / {
         return 302 https://$host$request_uri;
     }
@@ -18,5 +22,5 @@ server {
 
 include /etc/nginx/conf.d/fet.at/*.conf;
 include /etc/nginx/conf.d/luna.fet.at/*.conf;
-include /etc/nginx/conf.d/andis/*.at;
+
 
diff --git a/conf.d/fet.at/juri.conf b/conf.d/fet.at/infoscreen.conf
similarity index 62%
rename from conf.d/fet.at/juri.conf
rename to conf.d/fet.at/infoscreen.conf
index 53320cf..2488249 100644
--- a/conf.d/fet.at/juri.conf
+++ b/conf.d/fet.at/infoscreen.conf
@@ -2,9 +2,10 @@ server {
     listen 443 ssl;
     include ssl.conf;
     
-    server_name juri.fet.at;
-    set $proxy_host juri;
+    server_name infoscreen.fet.at;
+    set $proxy_host proteus;
     set $proxy_port 80;
 
     include default_proxy.conf;
-}
\ No newline at end of file
+}
+
diff --git a/conf.d/fet.at/instagram.fet.at b/conf.d/fet.at/instagram.fet.at
new file mode 100644
index 0000000..5395014
--- /dev/null
+++ b/conf.d/fet.at/instagram.fet.at
@@ -0,0 +1,11 @@
+server {
+    listen 443 ssl;
+    include ssl.conf;
+    
+    server_name instagram.fet.at;
+
+	location / {
+	return 302 https://www.instagram.com/fet_tuwien/;
+	}
+}
+