From 49484a2d1b08c723d8c19aa97e98d9467269cd28 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Sat, 28 Oct 2023 23:20:10 +0200 Subject: [PATCH] Switches Nextcloud 27 from Apache to Nginx to improve performance esp. of video streaming --- files/docker/proxy/Dockerfile | 3 - files/docker/proxy/uploadsize.conf | 2 - files/nginx.conf | 172 ++++++++++++++++++++++ tasks/main.yml | 21 ++- templates/docker-compose.nextcloud.yml.j2 | 18 ++- 5 files changed, 200 insertions(+), 16 deletions(-) delete mode 100644 files/docker/proxy/Dockerfile delete mode 100644 files/docker/proxy/uploadsize.conf create mode 100644 files/nginx.conf diff --git a/files/docker/proxy/Dockerfile b/files/docker/proxy/Dockerfile deleted file mode 100644 index 0c066d0..0000000 --- a/files/docker/proxy/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM jwilder/nginx-proxy:alpine - -COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf \ No newline at end of file diff --git a/files/docker/proxy/uploadsize.conf b/files/docker/proxy/uploadsize.conf deleted file mode 100644 index 70a739d..0000000 --- a/files/docker/proxy/uploadsize.conf +++ /dev/null @@ -1,2 +0,0 @@ -client_max_body_size 10G; -proxy_request_buffering off; \ No newline at end of file diff --git a/files/nginx.conf b/files/nginx.conf new file mode 100644 index 0000000..0f134fa --- /dev/null +++ b/files/nginx.conf @@ -0,0 +1,172 @@ +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; + + # Prevent nginx HTTP Server Detection + server_tokens off; + + keepalive_timeout 65; + + #gzip on; + + upstream php-handler { + server nextcloud-app:9000; + } + + server { + listen 80; + + # HSTS settings + # 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 Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; + + # set max upload size + client_max_body_size 512M; + 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; + + # Pagespeed is not supported by Nextcloud, so if your server is built + # with the `ngx_pagespeed` module, uncomment this line to disable it. + #pagespeed off; + + # HTTP response headers borrowed from Nextcloud `.htaccess` + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "noindex, nofollow" 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; + + # Specify how to handle directories -- specifying `/index.php$request_uri` + # here as the fallback means that Nginx always exhibits the desired behaviour + # when a client requests a path that corresponds to a directory that exists + # on the server. In particular, if that directory contains an index.php file, + # that file is correctly served; if it doesn't, then the request is passed to + # the front-end controller. This consistent behaviour means that we don't need + # to specify custom rules for certain paths (e.g. images and other assets, + # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus + # `try_files $uri $uri/ /index.php$request_uri` + # always provides the desired behaviour. + index index.php index.html /index.php$request_uri; + + # Rule borrowed from `.htaccess` to handle Microsoft DAV clients + location = / { + if ( $http_user_agent ~ ^DavClnt ) { + return 302 /remote.php/webdav/$is_args$args; + } + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Make a regex exception for `/.well-known` so that clients can still + # access it despite the existence of the regex rule + # `location ~ /(\.|autotest|...)` which would otherwise handle requests + # for `/.well-known`. + location ^~ /.well-known { + # The rules in this block are an adaptation of the rules + # in `.htaccess` that concern `/.well-known`. + + location = /.well-known/carddav { return 301 /remote.php/dav/; } + location = /.well-known/caldav { return 301 /remote.php/dav/; } + + location /.well-known/acme-challenge { try_files $uri $uri/ =404; } + location /.well-known/pki-validation { try_files $uri $uri/ =404; } + + # Let Nextcloud's API for `/.well-known` URIs handle all other + # requests by passing them to the front-end controller. + return 301 /index.php$request_uri; + } + + # Rules borrowed from `.htaccess` to hide certain paths from clients + location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; } + location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; } + + # Ensure this block, which passes PHP files to the PHP process, is above the blocks + # which handle static assets (as seen below). If this block is not declared first, + # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php` + # to the URI, resulting in a HTTP 500 error response. + location ~ \.php(?:$|/) { + # Required for legacy support + rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; + + 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; + + fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice + fastcgi_param front_controller_active true; # Enable pretty urls + fastcgi_pass php-handler; + + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + } + + location ~ \.(?:css|js|svg|gif)$ { + try_files $uri /index.php$request_uri; + expires 6M; # Cache-Control policy borrowed from `.htaccess` + access_log off; # Optional: Don't log access to assets + } + + location ~ \.woff2?$ { + try_files $uri /index.php$request_uri; + expires 7d; # Cache-Control policy borrowed from `.htaccess` + access_log off; # Optional: Don't log access to assets + } + + # Rule borrowed from `.htaccess` + location /remote { + return 301 /remote.php$request_uri; + } + + location / { + try_files $uri $uri/ /index.php$request_uri; + } + } +} diff --git a/tasks/main.yml b/tasks/main.yml index 9d246c5..79d2fab 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -7,6 +7,14 @@ owner: '{{ docker_user }}' group: '{{ docker_user }}' +- name: Provide nginx.conf + copy: + src: nginx.conf + dest: /home/{{ docker_user }}/nextcloud/nginx.conf + owner: "{{ docker_user }}" + group: "{{ docker_user }}" + mode: '0644' + - name: Provide docker-compose.yml template: src: templates/docker-compose.nextcloud.yml.j2 @@ -99,11 +107,12 @@ - assert: that: - - "output.ansible_facts['nextcloud-app']['nextcloud-app'].state.running" + - "output.services['nextcloud-app']['nextcloud-app'].state.running" + - "output.services['web']['nextcloud_web_1'].state.running" - name: Get container IP set_fact: - nextcloud_ip: "{{ output.ansible_facts['nextcloud-app']['nextcloud-app'].networks.nextcloud_default.IPAddress }}" + nextcloud_ip: "{{ output.services['web']['nextcloud_web_1'].networks.nextcloud_default.IPAddress }}" - name: "Waiting for Nextcloud container to become available" become: false @@ -131,16 +140,14 @@ become: false uri: url: "{{ nextcloud_overwrite_cli_url }}/login" - return_content: yes - timeout: 300 - validate_certs: no register: url_check delegate_to: localhost - until: "'Nextcloud' in url_check.content" retries: 5 delay: 10 tags: health - debug: var: url_check - tags: debug + tags: + - never + - debug diff --git a/templates/docker-compose.nextcloud.yml.j2 b/templates/docker-compose.nextcloud.yml.j2 index d419b56..57e2e21 100644 --- a/templates/docker-compose.nextcloud.yml.j2 +++ b/templates/docker-compose.nextcloud.yml.j2 @@ -21,11 +21,8 @@ services: restart: unless-stopped nextcloud-app: - image: nextcloud:apache + image: nextcloud:27-fpm container_name: nextcloud-app - networks: - - public - - default depends_on: - mysqldb volumes: @@ -33,6 +30,19 @@ services: - /etc/localtime:/etc/localtime:ro env_file: - nextcloud.env + + web: + image: nginx + restart: always + depends_on: + - nextcloud-app + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf:ro + - /etc/localtime:/etc/localtime:ro + - nextcloud:/var/www/html + networks: + - public + - default labels: - "traefik.enable=true" - "traefik.docker.network=traefik_public"