From de67d265930539c63f950a8e996060e18c334be2 Mon Sep 17 00:00:00 2001 From: Thumbscrew Date: Tue, 8 Feb 2022 23:15:15 +0000 Subject: [PATCH] remove unused nginx files rename NGINX_HOST to NEXTCLOUD_DOMAIN --- .env.example | 1 + docker-compose.yaml | 2 +- nginx/Dockerfile | 9 --------- nginx/default.conf | 29 ----------------------------- nginx/docker-entrypoint.sh | 6 ------ 5 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 nginx/Dockerfile delete mode 100644 nginx/default.conf delete mode 100644 nginx/docker-entrypoint.sh diff --git a/.env.example b/.env.example index 3578be4..e947225 100644 --- a/.env.example +++ b/.env.example @@ -4,6 +4,7 @@ DOCKER_PROXY_NETWORK=proxy # nextcloud NEXTCLOUD_TAG=23-apache +NEXTCLOUD_DOMAIN=nextcloud.example.com # postgres POSTGRES_TAG=14 diff --git a/docker-compose.yaml b/docker-compose.yaml index d2ddada..1c444f5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -64,7 +64,7 @@ services: NEXTCLOUD_ADMIN_PASSWORD_FILE: /run/secrets/nextcloud_admin_password NEXTCLOUD_ADMIN_USER_FILE: /run/secrets/nextcloud_admin_user REDIS_HOST: redis - NEXTCLOUD_TRUSTED_DOMAINS: ${NGINX_HOST} + NEXTCLOUD_TRUSTED_DOMAINS: ${NEXTCLOUD_DOMAIN} OVERWRITEPROTOCOL: https depends_on: - db diff --git a/nginx/Dockerfile b/nginx/Dockerfile deleted file mode 100644 index d0d9310..0000000 --- a/nginx/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM nginx:latest - -COPY default.conf /tmp/nginx/default.conf - -COPY docker-entrypoint.sh /tmp/docker-entrypoint.sh -RUN chmod 755 /tmp/docker-entrypoint.sh -ENTRYPOINT [ "/tmp/docker-entrypoint.sh" ] - -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/nginx/default.conf b/nginx/default.conf deleted file mode 100644 index d612b02..0000000 --- a/nginx/default.conf +++ /dev/null @@ -1,29 +0,0 @@ -server { - listen 443 ssl; - server_name ${NGINX_HOST}; - - ssl_certificate /etc/ssl/certs/server.cert.pem; - ssl_certificate_key /etc/ssl/private/server.key.pem; - - location / { - proxy_pass http://nextcloud:80; - proxy_headers_hash_max_size 512; - proxy_headers_hash_bucket_size 64; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - add_header Front-End-Https on; - client_max_body_size 5G; - } -} - -server { - if ($host = ${NGINX_HOST}) { - return 301 https://$host$request_uri; - } - - listen 80; - - server_name ${NGINX_HOST}; -} \ No newline at end of file diff --git a/nginx/docker-entrypoint.sh b/nginx/docker-entrypoint.sh deleted file mode 100644 index 47a0498..0000000 --- a/nginx/docker-entrypoint.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh -set -eu - -envsubst '${NGINX_HOST}' < /tmp/nginx/default.conf > /etc/nginx/conf.d/default.conf - -exec "$@" \ No newline at end of file