From e516cb2ecf82a88e01b57c250ea133e9380cbc3f Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Sun, 23 May 2021 20:48:24 +0000
Subject: [PATCH] compose conf

---
 conf/default.conf  | 32 +++++++++++++++++++++++++++-----
 docker-compose.yml |  6 ++++++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/conf/default.conf b/conf/default.conf
index f6a7c06..22916d9 100644
--- a/conf/default.conf
+++ b/conf/default.conf
@@ -2,16 +2,38 @@ server {
     listen 80;
     include get_auto_ssl.conf;
 }
+
+# Dieser Server ist der Zugang zur "Nginx config und wird im 2. Openresty Server genutzt"
+server {
+    listen 8080;
+    include ldap.conf;
+    resolver 127.0.0.11 valid=30s;    
+    set $theiaconf theiaconf;
+        location / {
+        proxy_set_header Host $host;
+        proxy_set_header Proxy "";
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarde-Proto $scheme;
+        proxy_buffering off;
+        proxy_pass http://$theiaconf:3000;
+        }
+}
+
+
 server {
     listen 443 ssl;
     include auto_ssl.conf;
     include ldap.conf;
+    
     resolver 127.0.0.11 valid=30s;    
     set $theia theia;
-    location / {
-        #rewrite_log on;
-        #rewrite /dev/(.*) /$1 break;
-        #rewrite ^/dev$ /dev/ permanent;
+    location /dev {
+        rewrite_log on;
+        rewrite /dev/(.*) /$1 break;
+        rewrite ^/dev$ /dev/ permanent;
         proxy_set_header Host $host;
         proxy_set_header Proxy "";
         proxy_set_header Upgrade $http_upgrade;
@@ -22,7 +44,7 @@ server {
         
         
         proxy_buffering off;
-        proxy_pass http://$theiaconf:3000;
+        proxy_pass http://$theia:3000;
     }
 
 }
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index d88893a..78346bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,12 @@ services:
       - "4443:443"
     volumes:
      - nginxconf:/etc/nginx/conf.d/
+  openresty:
+    image: docker.triton2.fet.at/openrestyfet:latest
+    ports:
+      - "8081:8080"
+    volumes:
+     - nginxconf:/etc/nginx/conf.d/
   theiaconf:
     image: docker.triton2.fet.at/dev_theia
     volumes: