Commit 3da49662 authored by nimrod's avatar nimrod
Browse files

Nginx updates. 

Copy the mater branch from web-proxy-docker.
parent a866f7ab

nginx/Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM docker.io/library/nginx:1.21.3-alpine

FROM docker.io/nginx:1.23.1-alpine

# hadolint ignore=DL3018

RUN rm -rf /etc/nginx/conf./* && \

    chmod 777 /run && \

nginx/conf.d/default.conf

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ server { 
server {

    listen      443 ssl http2 default_server;

    listen      [::]:443 ssl http2 default_server;

    include     snippets/ssl.conf;

    include     snippets/ssl-legacy.conf;

    location    / { return 301 https://www.shore.co.il$request_uri; }

}

nginx/snippets/ldap-auth.conf

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ location = /validate { 
  proxy_pass                        https://auth.shore.co.il/validate;

  proxy_http_version                1.1;

  include                           snippets/proxy-ssl.conf;

  proxy_ssl_name                    auth.shore.co.il;

  internal;

  proxy_pass_request_body           off;

  proxy_set_header Content-Length   "";

nginx/snippets/matrix-well-known.conf

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# vim: ft=nginx

location = /.well-known/matrix/server {

    return 200 "{\"m.server\": \"matrix.shore.co.il:443\"}";

}

nginx/snippets/proxy-ssl.conf

+0 −1
Original line number Diff line number Diff line 
# vim: ft=nginx

proxy_ssl_verify                  on;

proxy_ssl_verify_depth            3;

proxy_ssl_name                    auth.shore.co.il;

proxy_ssl_server_name             on;

proxy_ssl_trusted_certificate     /etc/ssl/certs/ca-certificates.crt;