summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2019-10-11 14:52:38 +0200
committerSuren A. Chilingaryan <csa@suren.me>2019-10-11 14:52:38 +0200
commit64ce83b06744bc7280db6a9fb05680c7673776ae (patch)
treee19eff64f8dd410fa6d1a89a01b6fd9707193692
parenteed898a473b73d87d2d50ffdaa9c6eeb43748f69 (diff)
downloadiperouter-64ce83b06744bc7280db6a9fb05680c7673776ae.tar.gz
iperouter-64ce83b06744bc7280db6a9fb05680c7673776ae.tar.bz2
iperouter-64ce83b06744bc7280db6a9fb05680c7673776ae.tar.xz
iperouter-64ce83b06744bc7280db6a9fb05680c7673776ae.zip
UFO web site fixes and few redirects for BORA stuff
-rw-r--r--conf.d/01_ipranges.conf11
-rw-r--r--conf.d/git.conf3
-rw-r--r--katrin.d/bora.conf3
-rw-r--r--katrin.d/data_proxy.variant2
-rw-r--r--katrin.d/hiu.conf3
-rw-r--r--ufo.d/ufoweb.conf19
6 files changed, 38 insertions, 3 deletions
diff --git a/conf.d/01_ipranges.conf b/conf.d/01_ipranges.conf
index 5bf8ba9..a825b42 100644
--- a/conf.d/01_ipranges.conf
+++ b/conf.d/01_ipranges.conf
@@ -1,5 +1,16 @@
geo $kit_client {
default 0;
+ 141.52.0.0/16 1;
+ 192.168.26.0/24 1;
+}
+
+geo $ipe_client {
+ default 0;
141.52.64.0/23 1;
192.168.26.0/24 1;
}
+
+geo $ds_client {
+ default 0;
+ 192.168.26.0/24 1;
+}
diff --git a/conf.d/git.conf b/conf.d/git.conf
index 24fbde0..68f1366 100644
--- a/conf.d/git.conf
+++ b/conf.d/git.conf
@@ -8,6 +8,7 @@ server {
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;
- }
+ client_max_body_size 256m;
+ }
}
diff --git a/katrin.d/bora.conf b/katrin.d/bora.conf
new file mode 100644
index 0000000..7e4c851
--- /dev/null
+++ b/katrin.d/bora.conf
@@ -0,0 +1,3 @@
+location ~* ^/status/([^/]+)(/?.*)$ {
+ return 301 http://bora-$1.kaas.kit.edu$2;
+}
diff --git a/katrin.d/data_proxy.variant b/katrin.d/data_proxy.variant
index 2b9a795..0658c5f 100644
--- a/katrin.d/data_proxy.variant
+++ b/katrin.d/data_proxy.variant
@@ -1,6 +1,6 @@
location /data {
if ($kit_client) {
- return 301 http://192.168.26.170$request_uri;
+ return 301 http://ipepdvarchive.ipe.kit.edu$request_uri;
}
return 301 http://$host/remote$request_uri;
diff --git a/katrin.d/hiu.conf b/katrin.d/hiu.conf
new file mode 100644
index 0000000..981a9b3
--- /dev/null
+++ b/katrin.d/hiu.conf
@@ -0,0 +1,3 @@
+location /adeistatus {
+ return 301 http://web-kopmann.kaas.kit.edu$request_uri;
+}
diff --git a/ufo.d/ufoweb.conf b/ufo.d/ufoweb.conf
index 5a134a2..61a3e30 100644
--- a/ufo.d/ufoweb.conf
+++ b/ufo.d/ufoweb.conf
@@ -1,9 +1,26 @@
rewrite ^/$ http://ufo.kit.edu/dis/;
-location /dis {
+location /dis/ {
proxy_pass https://192.168.26.211/dis/;
+ proxy_pass_header Set-Cookie;
+
+ 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;
+
+ client_max_body_size 128m;
+}
+
+# Actual error is in the UFO web site. Should be fixed on KaaS
+location /dis/index.php/ufo/ {
+ proxy_pass https://192.168.26.211/dis/index.php/project/;
+ proxy_pass_header Set-Cookie;
+
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;
+
+ client_max_body_size 128m;
}