update nginx configuration

openbudgets · Apr 27, 2018 · 7f9de0b · 7f9de0b
1 parent 33ae776
commit 7f9de0b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/docker-config/nginx/conf/includes/http_server_data_obeu.conf b/docker-config/nginx/conf/includes/http_server_data_obeu.conf
@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name data.openbudgets.eu;
+    server_name data.openbudget.kdvz-frechen.de;
 
     # For debugging:
     rewrite_log on;
@@ -15,7 +15,7 @@ server {
 
     ###################### Include Apps ###########################
 
-    include includes/locations/rdfbrowser.conf;
+    #include includes/locations/rdfbrowser.conf;
 
-    include includes/locations/triplestore.conf;
+    #include includes/locations/triplestore.conf;
 }
diff --git a/docker-config/nginx/conf/includes/http_server_eis_obeu.conf b/docker-config/nginx/conf/includes/http_server_eis_obeu.conf
@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name apps.openbudgets.eu;
+    server_name openbudget.kdvz-frechen.de;
     # For debugging:
     rewrite_log on;
 
@@ -36,6 +36,8 @@ server {
 
     include includes/locations/opencpu.conf;
 
+    include includes/locations/rdfbrowser.conf;
+
     ######################### Lets encrypt ############################
 
     location /.well-known {
@@ -59,7 +61,7 @@ server {
 # Serving Static Output Files of Linked Pipes as alternative to Ftp:
 server {
     listen 2222;
-    server_name apps.openbudgets.eu;
+    server_name openbudget.kdvz-frechen.de;
     autoindex on;
 
     root /var/www/linkedpipes/data/lp/etl/working/data;

diff --git a/docker-config/nginx/conf/includes/https_server_eis_obeu.conf b/docker-config/nginx/conf/includes/https_server_eis_obeu.conf
@@ -1,7 +1,7 @@
 server {
     #ssl off;
     listen 443 ssl;
-    server_name apps.openbudgets.eu;
+    server_name openbudget.kdvz-frechen.de;
 
     access_log  /var/log/nginx/ssl_access.log  main;
 

diff --git a/docker-config/nginx/conf/includes/locations/linkedpipes.conf b/docker-config/nginx/conf/includes/locations/linkedpipes.conf
@@ -6,7 +6,7 @@ location = /linkedpipes/execute/fdp2rdf {
     proxy_pass http://linkedpipes_fdp:8181/resources/executions?pipeline=http://localhost:8181/resources/pipelines/created-1497599817206;
 }
 
-location /linkedpipes/test {
+location /linkedpipes/test/ {
   add_header Strict-Transport-Security "max-age=0; includeSubdomains;";
   add_header Cache-Control "no-store, no-cache, must-revalidate";
   expires -1;

diff --git a/docker-config/nginx/conf/includes/locations/rdfbrowser.conf b/docker-config/nginx/conf/includes/locations/rdfbrowser.conf
@@ -1,9 +1,13 @@
-location / {
-    proxy_set_header        Host data.openbudgets.eu;
+location /rdfbrowser {
+
+    add_header Strict-Transport-Security "max-age=0; includeSubdomains;";
+    add_header Cache-Control "no-store, no-cache, must-revalidate";
+    expires -1;
+    proxy_set_header        Host $host;
     proxy_set_header        X-Real-IP $remote_addr;
     proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header        X-Forwarded-Proto $scheme;
 
     root /var/www/RDFBrowser/public;
     proxy_pass http://rdfbrowser:80;
-}
+}
diff --git a/docker-config/nginx/conf/nginx.conf b/docker-config/nginx/conf/nginx.conf
@@ -37,11 +37,11 @@ http {
 
     # CNAME for Dataset-URLs:
 
-    include includes/http_server_data_obeu.conf;
+    #include includes/http_server_data_obeu.conf;
 
     # Domain for OS-Viewer, Rudolf:
 
     include includes/http_server_eis_obeu.conf;
 
-    include includes/https_server_eis_obeu.conf;
+#    include includes/https_server_eis_obeu.conf;
 }