diff --git a/.theia/settings.json b/.theia/settings.json index 6529d2e..1562066 100644 --- a/.theia/settings.json +++ b/.theia/settings.json @@ -1,4 +1,4 @@ { - "workbench.colorTheme": "light" + "workbench.colorTheme": "Default Dark+" } \ No newline at end of file diff --git a/README.txt b/README.md similarity index 59% rename from README.txt rename to README.md index dba0c26..6fc169c 100644 --- a/README.txt +++ b/README.md @@ -1,5 +1,10 @@ +# Anleitung für Proxy Server in der FET + + location / { include proxy.conf; proxy_buffering off; proxy_pass http://$proxy_host:$proxy_port; -} \ No newline at end of file +} + +include internal_proxy.conf; \ No newline at end of file diff --git a/andis/jenkins.fet.at b/andis/jenkins.fet.at index 1eb9951..30b8fca 100644 --- a/andis/jenkins.fet.at +++ b/andis/jenkins.fet.at @@ -11,7 +11,7 @@ server { proxy_buffering off; proxy_max_temp_file_size 0; proxy_pass http://$proxy_host:$proxy_port; - proxy_set_header Authorization "Basic YWRtaW46OGNmMTY5NGU4MTMyNGQ0MjhiMjVmNmEzMGIwZGQyYjA="; + #proxy_set_header Authorization "Basic YWRtaW46OGNmMTY5NGU4MTMyNGQ0MjhiMjVmNmEzMGIwZGQyYjA="; proxy_pass_header Authorization; } diff --git a/andis/jenkins2.fet.at b/andis/jenkins2.fet.at new file mode 100644 index 0000000..4b501b1 --- /dev/null +++ b/andis/jenkins2.fet.at @@ -0,0 +1,18 @@ + +server { + listen 443 ssl ; + server_name jenkins2.nginx.fet.at; + include ssl.conf; + set $proxy_host triton20; + set $proxy_port 49155; + location / { + include proxy.conf; + include ldap.conf; + proxy_buffering off; + proxy_max_temp_file_size 0; + proxy_pass http://$proxy_host:$proxy_port; + #proxy_set_header Authorization "Basic YWRtaW46N2RmMGFkMDJjOTQ3NDJlYWJlZmJkZTFhNzMwOWMyYWQ="; + proxy_pass_header Authorization; + } + +} \ No newline at end of file diff --git a/default.conf b/default.conf index 5b85d72..18d457c 100644 --- a/default.conf +++ b/default.conf @@ -75,5 +75,6 @@ server { 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/andis/*.at; include /etc/nginx/conf.d/fachschaften.at/*.at; diff --git a/dev/docker.nginx.fet.at b/dev/docker.nginx.fet.at new file mode 100644 index 0000000..b197298 --- /dev/null +++ b/dev/docker.nginx.fet.at @@ -0,0 +1,18 @@ + +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