From b843fc68affbc781cb19974f90ffe3359e3afde4 Mon Sep 17 00:00:00 2001 From: Mike Holloway Date: Sun, 7 Dec 2025 17:55:06 -0500 Subject: [PATCH] nginx test --- files/nginx/Dockerfile | 3 + tasks/files.yml | 10 +- templates/default.conf.j2 | 169 ++++++++++++++++++++++++++++++++ templates/docker-compose.yml.j2 | 7 +- 4 files changed, 183 insertions(+), 6 deletions(-) create mode 100644 files/nginx/Dockerfile create mode 100644 templates/default.conf.j2 diff --git a/files/nginx/Dockerfile b/files/nginx/Dockerfile new file mode 100644 index 0000000..8a1b6b8 --- /dev/null +++ b/files/nginx/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:latest + +RUN sed 's/\#gzip.*on;/server_tokens\toff;\n #gzip\ton;/' /etc/nginx/nginx.conf diff --git a/tasks/files.yml b/tasks/files.yml index 803d5b9..e0e2ac8 100644 --- a/tasks/files.yml +++ b/tasks/files.yml @@ -7,11 +7,17 @@ with_items: - "webroot" - "nginx/certs" - - "nginx/html" - - "nginx/vhost.d" + - "nginx/conf.d" loop_control: loop_var: "subdir" +- name: Create NGINX Conf File + template: + src: "default.conf.j2" + dest: "/home/{{ user.name }}/nginx/conf.d/default.conf" + owner: "{{ user.name }}" + group: "{{ user.name }}" + - name: Create Compose File template: src: "docker-compose.yml.j2" diff --git a/templates/default.conf.j2 b/templates/default.conf.j2 new file mode 100644 index 0000000..b5bfee6 --- /dev/null +++ b/templates/default.conf.j2 @@ -0,0 +1,169 @@ + upstream php-handler { + zone backends 64k; + server 127.0.0.1:9000; + } + + server { + listen 8080; + + return 301 https://$server_name$request_uri/; + } + server { + listen 4443 ssl; + + server_name {{ inventory_hostname | default('ansible_undefined_host') }}; + ssl_certificate /etc/nginx/certs/{{ inventory_hostname | default('ansible_undefined_host') }}.crt + ssl_certificate_key /etc/nginx/certs/{{ inventory_hostname | default('ansible_undefined_host') }}.key + + # 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 and increase upload timeout: + client_max_body_size 512M; + client_body_timeout 300s; + fastcgi_buffers 64 4K; + + # The settings allows you to optimize the HTTP2 bandwidth. + # See https://blog.cloudflare.com/delivering-http-2-upload-speed-improvements/ + # for tuning hints + client_body_buffer_size 512k; + + # 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 text/javascript application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm 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\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/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; + + fastcgi_max_temp_file_size 0; + } + + # Serve static files + location ~ \.(?:css|js|mjs|svg|gif|ico|jpg|png|webp|wasm|tflite|map|ogg|flac)$ { + try_files $uri /index.php$request_uri; + add_header Cache-Control "public, max-age=15778463$asset_immutable"; + 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; + access_log off; # Optional: Don't log access to assets + + location ~ \.wasm$ { + default_type application/wasm; + } + } + + location ~ \.(otf|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/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index 5702e6d..17b4933 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -23,16 +23,15 @@ services: - "nextcloud.local" nginx: - image: nginx:latest + build: ./nginx ports: - 8080:80 # change to 80:80 when the shop is ready to go live - 4443:443 # change to 80:80 when the shop is ready to go live networks: default: volumes: - - ~/nginx/certs:/etc/nginx/certs - - ~/nginx/html:/usr/share/nginx/html - - /run/user/{{ getent_passwd[user.name][2] }}/podman/podman.sock:/tmp/docker.sock:ro + - ~/nginx/certs:/etc/nginx/certs:z,ro + - ~/nginx/conf.d:/etc/nginx/conf.d:z,ro db: image: postgres:alpine