From fa2bcec03368ab0a1e4e4c58c55e12ca13d23b6c Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Sun, 13 Mar 2022 15:38:34 +0100
Subject: [PATCH] clean up conf files

---
 conf.d/default.conf                           | 42 ++-----------------
 conf.d/dev/devdoc.conf                        | 32 --------------
 conf.d/dev/devnginx.conf                      | 11 -----
 conf.d/dev/docker.nginx.fet.at                | 18 --------
 conf.d/fet.at/{fet.at.conf => default.conf}   |  1 -
 .../jenkins.fet.at => fet.at/jenkins.conf}    |  4 +-
 conf.d/fet.at/juri.conf                       |  8 ++++
 7 files changed, 13 insertions(+), 103 deletions(-)
 delete mode 100644 conf.d/dev/devdoc.conf
 delete mode 100644 conf.d/dev/devnginx.conf
 delete mode 100644 conf.d/dev/docker.nginx.fet.at
 rename conf.d/fet.at/{fet.at.conf => default.conf} (88%)
 rename conf.d/{dev/jenkins.fet.at => fet.at/jenkins.conf} (67%)
 create mode 100644 conf.d/fet.at/juri.conf

diff --git a/conf.d/default.conf b/conf.d/default.conf
index 70891b6..7a1391d 100644
--- a/conf.d/default.conf
+++ b/conf.d/default.conf
@@ -8,51 +8,15 @@ server {
     
 server {
     listen 443 ssl default_server;
-    server_name kistl.htu.tuwien.ac.at;
     include ldap.conf;
     include ssl.conf;
     resolver 127.0.0.11 valid=30s;
-    set $theia theiaconf;
     add_header X-debug-message "Fallback Entry" always;
-    location /dev {
-        rewrite_log on;
-        rewrite /dev/(.*) /$1 break;
-        rewrite ^/dev$ /dev/ permanent;
-        include proxy.conf;
-        proxy_buffering off;
-        proxy_pass http://$theia:3000;
-    }
-
+    return 404;
 }
 
 
-
-server {
-    listen 443 ssl;
-    server_name test.kistl.htu.tuwien.ac.at;
-    include ssl.conf;
-    include ldap.conf;
-    set $proxy_host theiaconf;
-    set $proxy_port 3000;
-    include default_proxy.conf;
-}
-
-
-
-
-server {
-    listen 443 ssl;
-    server_name triton2.nginx.fet.at;
-    set $proxy_host devnginx_theia_1;
-    set $proxy_port 3000;
-    include ldap.conf;
-    include ssl.conf;
-    add_header Access-Control-Allow-Origin https://open-vsx.org;
-    include default_proxy.conf;
-}
-
 include /etc/nginx/conf.d/fet.at/*.conf;
-include /etc/nginx/conf.d/dev/*.conf;
-include /etc/nginx/conf.d/dev/*.at;
+include /etc/nginx/conf.d/luna.fet.at/*.conf;
 include /etc/nginx/conf.d/andis/*.at;
-include /etc/nginx/conf.d/fachschaften.at/*.at;
+
diff --git a/conf.d/dev/devdoc.conf b/conf.d/dev/devdoc.conf
deleted file mode 100644
index abb9ba8..0000000
--- a/conf.d/dev/devdoc.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-server {
-    listen 443 ssl;
-    server_name doc.nginx.fet.at;
-    include ldap.conf;
-    include ssl.conf;
-    #resolver 127.0.0.11 valid=30s;
-    set $triton20 triton20;
-   
-   location / {
- #       include secure.conf;
-        include proxy.conf;
-        proxy_buffering off;
-        proxy_pass http://$triton20:7102;
-    }
-    location /dev {
-        rewrite_log off;
-        rewrite /dev/(.*) /$1 break;
-        rewrite ^/dev$ /dev/ permanent;
-        include proxy.conf;
-        proxy_buffering off;
-        proxy_pass http://$triton20:7101;
-    }
-    location /edit {
-        rewrite_log off;
-        rewrite /edit/(.*) /$1 break;
-        rewrite ^/edit$ /edit/ permanent;
-        include proxy.conf;
-        proxy_buffering off;
-        proxy_pass http://$triton20:7100;
-    }
-
-}
diff --git a/conf.d/dev/devnginx.conf b/conf.d/dev/devnginx.conf
deleted file mode 100644
index 92718f6..0000000
--- a/conf.d/dev/devnginx.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-
-server {
-    listen 443 ssl;
-    server_name nginx.t2.fet.at;
-    include ssl.conf;
-    include ldap.conf;
-    set $proxy_host devnginx_theia_1;
-    set $proxy_port 3000;
-    include default_proxy.conf;
-}
-
diff --git a/conf.d/dev/docker.nginx.fet.at b/conf.d/dev/docker.nginx.fet.at
deleted file mode 100644
index b197298..0000000
--- a/conf.d/dev/docker.nginx.fet.at
+++ /dev/null
@@ -1,18 +0,0 @@
-
-server {
-    listen 443 ssl;
-    server_name docker.triton2.fet.at;
-    include ssl.conf;
-    client_max_body_size 1000M;
-    include ldap.conf;
-    set $proxy_host rancher;
-    set $proxy_port 5000;
-    location / {
-        include proxy.conf;
-        include secure.conf;
-        proxy_buffering off;
-        proxy_pass http://$proxy_host:$proxy_port;
-        client_max_body_size 1000M;
-    }
-
-}
\ No newline at end of file
diff --git a/conf.d/fet.at/fet.at.conf b/conf.d/fet.at/default.conf
similarity index 88%
rename from conf.d/fet.at/fet.at.conf
rename to conf.d/fet.at/default.conf
index be804f5..8bc03d8 100644
--- a/conf.d/fet.at/fet.at.conf
+++ b/conf.d/fet.at/default.conf
@@ -4,7 +4,6 @@ server {
     set $proxy_host fetsite21;
     set $proxy_port 8001;
     include ssl.conf;
-    include secure.conf;
     include default_proxy.conf;
     proxy_set_header Host fet.at;
 }
diff --git a/conf.d/dev/jenkins.fet.at b/conf.d/fet.at/jenkins.conf
similarity index 67%
rename from conf.d/dev/jenkins.fet.at
rename to conf.d/fet.at/jenkins.conf
index 4893073..ce8b364 100644
--- a/conf.d/dev/jenkins.fet.at
+++ b/conf.d/fet.at/jenkins.conf
@@ -3,8 +3,8 @@ server {
     listen 443 ssl ;
     server_name jenkins.fet.at;
     include ssl.conf;
-    set $proxy_host jenkins_01;
-    set $proxy_port 8080;
+    set $proxy_host trition20;
+    set $proxy_port 49155;
     include default_proxy.conf;
  
 }
diff --git a/conf.d/fet.at/juri.conf b/conf.d/fet.at/juri.conf
new file mode 100644
index 0000000..33631e9
--- /dev/null
+++ b/conf.d/fet.at/juri.conf
@@ -0,0 +1,8 @@
+server {
+    listen 443 ssl;
+    server_name juri.fet.at;
+    set $proxy_host juri;
+    set $proxy_port 80;
+    include ssl.conf;
+    include internal_proxy.conf;
+}
\ No newline at end of file