From 83d4d3ebac8d353b0ad3a764c9c592b4da85bf5c Mon Sep 17 00:00:00 2001 From: Simon C Date: Mon, 22 Feb 2021 09:58:58 +0100 Subject: [PATCH] feat: Change Nextcloud to use FPM --- nextcloud/.env | 2 +- nextcloud/docker-compose.yml | 33 ++++--- nextcloud/web/Dockerfile | 3 + nextcloud/web/nginx.conf | 168 +++++++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+), 12 deletions(-) create mode 100644 nextcloud/web/Dockerfile create mode 100644 nextcloud/web/nginx.conf diff --git a/nextcloud/.env b/nextcloud/.env index 198fa21..8a7c7c6 100644 --- a/nextcloud/.env +++ b/nextcloud/.env @@ -9,7 +9,7 @@ TRAEFIK_NETWORK_NAME=kifeart NEXTCLOUD_CONTAINER_NAME=nextcloud NEXTCLOUD_VOLUME_NAME=nextcloud NEXTCLOUD_DOMAIN=nextcloud.cool.life -NEXTCLOUD_IMAGE=nextcloud:20.0.5 +NEXTCLOUD_IMAGE=nextcloud:20.0.7-fpm-alpine NEXTCLOUD_ADMIN_USER: user NEXTCLOUD_ADMIN_PASSWORD: password diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 86140e3..52585c9 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -12,8 +12,27 @@ volumes: services: - nextcloud: - container_name: ${NEXTCLOUD_CONTAINER_NAME} + nextcloud-web: + container_name: nextcloud-web + build: ./web + restart: always + ports: + - 80:80 + depends_on: + - nextcloud-fpm + volumes: + - nextcloud:/var/www/html + labels: + traefik.enable: 'true' + traefik.docker.network: ${TRAEFIK_NETWORK_NAME} + traefik.http.routers.nextcloud-fpm.rule: 'Host(`${NEXTCLOUD_DOMAIN}`)' + traefik.http.routers.nextcloud-fpm.entrypoints: 'web' + traefik.http.routers.nextcloud-fpm.middlewares: nextcloud_redirect + traefik.http.middlewares.nextcloud_redirect-fpm.redirectregex.regex: /.well-known/(card|cal)dav + traefik.http.middlewares.nextcloud_redirect-fpm.redirectregex.replacement: /remote.php/dav/ + + nextcloud-fpm: + container_name: nextcloud-fpm image: ${NEXTCLOUD_IMAGE} restart: always hostname: ${NEXTCLOUD_DOMAIN} @@ -39,14 +58,6 @@ services: REDIS_HOST: 'nextcloud-redis' PUID: 1001 PGID: 119 - labels: - traefik.enable: 'true' - traefik.docker.network: ${TRAEFIK_NETWORK_NAME} - traefik.http.routers.nextcloud.rule: 'Host(`${NEXTCLOUD_DOMAIN}`)' - traefik.http.routers.nextcloud.entrypoints: 'web' - traefik.http.routers.nextcloud.middlewares: nextcloud_redirect - traefik.http.middlewares.nextcloud_redirect.redirectregex.regex: /.well-known/(card|cal)dav - traefik.http.middlewares.nextcloud_redirect.redirectregex.replacement: /remote.php/dav/ nextcloud-postgres: container_name: ${POSTGRES_CONTAINER_NAME} @@ -79,7 +90,7 @@ services: container_name: nextcloud-cron restart: always depends_on: - - nextcloud + - nextcloud-web entrypoint: /cron.sh environment: PUID: 1001 diff --git a/nextcloud/web/Dockerfile b/nextcloud/web/Dockerfile new file mode 100644 index 0000000..01cf2a6 --- /dev/null +++ b/nextcloud/web/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:1.19.6-alpine + +COPY nginx.conf /etc/nginx/nginx.conf diff --git a/nextcloud/web/nginx.conf b/nextcloud/web/nginx.conf new file mode 100644 index 0000000..17b96cd --- /dev/null +++ b/nextcloud/web/nginx.conf @@ -0,0 +1,168 @@ +worker_processes auto; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + upstream php-handler { + server nextcloud-fpm:9000; + } + + server { + listen 80; + + # Add headers to serve security related headers + # Before enabling Strict-Transport-Security headers please read into this + # topic first. + #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; + # + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Download-Options "noopen" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "none" always; + add_header X-XSS-Protection "1; mode=block" always; + + # Remove X-Powered-By, which is an information leak + fastcgi_hide_header X-Powered-By; + + # Path to the root of your installation + root /var/www/html; + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # The following 2 rules are only needed for the user_webfinger app. + # Uncomment it if you're planning to use this app. + #rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + #rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + + # The following rule is only needed for the Social app. + # Uncomment it if you're planning to use this app. + #rewrite ^/.well-known/webfinger /public.php?service=webfinger last; + + location = /.well-known/carddav { + return 301 $scheme://$host:$server_port/remote.php/dav; + } + + location = /.well-known/caldav { + return 301 $scheme://$host:$server_port/remote.php/dav; + } + + # set max upload size + client_max_body_size 10G; + fastcgi_buffers 64 4K; + + # Enable gzip but do not remove ETag headers + gzip on; + gzip_vary on; + gzip_comp_level 4; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; + gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; + + # Uncomment if your server is build with the ngx_pagespeed module + # This module is currently not supported. + #pagespeed off; + + location / { + rewrite ^ /index.php; + } + + location ~ ^\/(?:build|tests|config|lib|3rdparty|templates|data)\/ { + deny all; + } + location ~ ^\/(?:\.|autotest|occ|issue|indie|db_|console) { + deny all; + } + + location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) { + fastcgi_split_path_info ^(.+?\.php)(\/.*|)$; + set $path_info $fastcgi_path_info; + try_files $fastcgi_script_name =404; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $path_info; + # fastcgi_param HTTPS on; + + # Avoid sending the security headers twice + fastcgi_param modHeadersAvailable true; + + # Enable pretty urls + fastcgi_param front_controller_active true; + fastcgi_pass php-handler; + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + } + + location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) { + try_files $uri/ =404; + index index.php; + } + + # Adding the cache control header for js, css and map files + # Make sure it is BELOW the PHP block + location ~ \.(?:css|js|woff2?|svg|gif|map)$ { + try_files $uri /index.php$request_uri; + add_header Cache-Control "public, max-age=15778463"; + # Add headers to serve security related headers (It is intended to + # have those duplicated to the ones above) + # Before enabling Strict-Transport-Security headers please read into + # this topic first. + #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; + # + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Download-Options "noopen" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "none" always; + add_header X-XSS-Protection "1; mode=block" always; + + # Optional: Don't log access to assets + access_log off; + } + + location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$ { + try_files $uri /index.php$request_uri; + # Optional: Don't log access to other assets + access_log off; + } + } +}