From b559225f5c1b3e65222b12e2351ce0beb37db191 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Wed, 1 Nov 2023 14:21:01 +0300 Subject: [PATCH] add auth & off configs --- .env | 2 +- config/{nginx.conf => nginx.auth.conf} | 0 config/nginx.off.conf | 44 +++++++++++++++++++ docker-compose.yml => docker-compose.auth.yml | 2 +- docker-compose.off.yml | 23 ++++++++++ 5 files changed, 69 insertions(+), 2 deletions(-) rename config/{nginx.conf => nginx.auth.conf} (100%) create mode 100644 config/nginx.off.conf rename docker-compose.yml => docker-compose.auth.yml (86%) create mode 100644 docker-compose.off.yml diff --git a/.env b/.env index deb5bed..382f517 100644 --- a/.env +++ b/.env @@ -6,4 +6,4 @@ TRAEFIK_ENTRYPOINTS=web-secure WEB_HOST= APPLICATION= AUTH_MODE=ldap -# AUTH_MODE=standard +# AUTH_MODE=account diff --git a/config/nginx.conf b/config/nginx.auth.conf similarity index 100% rename from config/nginx.conf rename to config/nginx.auth.conf diff --git a/config/nginx.off.conf b/config/nginx.off.conf new file mode 100644 index 0000000..d2e0e2c --- /dev/null +++ b/config/nginx.off.conf @@ -0,0 +1,44 @@ +upstream app { + server $APPLICATION; +} + + include /etc/nginx/include/upstream.conf; + + +server { + listen 80; + include /etc/nginx/mime.types; + + gzip on; + gzip_min_length 1000; + gzip_proxied any; + gzip_comp_level 1; + gzip_types text/css text/javascript text/xml text/plain text/x-component application/javascript application/json application/xml application/rss+xml font/truetype font/opentype application/vnd.ms-fontobject image/svg+xml; + gzip_vary on; + gzip_disable "msie6"; + + + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + proxy_redirect off; + proxy_set_header X-Original-URI $request_uri; + proxy_set_header X-Original-Remote-Addr $remote_addr; + proxy_set_header X-Original-Host $host; + + + + location / { + proxy_pass http://app; + } + + location = /health { + access_log off; + add_header 'Content-Type' 'application/json'; + return 200 'UP'; + } + + include /etc/nginx/include/location.conf; +} diff --git a/docker-compose.yml b/docker-compose.auth.yml similarity index 86% rename from docker-compose.yml rename to docker-compose.auth.yml index d655824..ae68853 100644 --- a/docker-compose.yml +++ b/docker-compose.auth.yml @@ -10,7 +10,7 @@ services: - APPLICATION=${APPLICATION} - AUTH_MODE=${AUTH_MODE} volumes: - - ./config/nginx.conf:/etc/nginx/templates/default.conf.template + - ./config/nginx.auth.conf:/etc/nginx/templates/default.conf.template - ./config/include:/etc/nginx/include restart: always networks: diff --git a/docker-compose.off.yml b/docker-compose.off.yml new file mode 100644 index 0000000..55b846e --- /dev/null +++ b/docker-compose.off.yml @@ -0,0 +1,23 @@ +version: '3' + +services: + server: + extends: + file: docker-compose.traefik.yml + service: server + image: nginx:alpine + environment: + - APPLICATION=${APPLICATION} + volumes: + - ./config/nginx.off.conf:/etc/nginx/templates/default.conf.template + - ./config/include:/etc/nginx/include + restart: always + networks: + - app_network + +networks: + app_network: + external: true + name: ${NETWORK_NAME} + web: + external: true