diff --git a/tasks/certificates.yml b/tasks/certificates.yml index 2ae28f5..31f5703 100644 --- a/tasks/certificates.yml +++ b/tasks/certificates.yml @@ -1,6 +1,6 @@ - name: Check for certs file: - path: "/home/nextcloud/nginx/certs/{{ item }}" + path: "/home/{{ user.name }}/proxy/certs/{{ item }}" state: file loop: - "{{ inventory_hostname }}.key" diff --git a/tasks/certificates_certbot.yml b/tasks/certificates_certbot.yml index e6cf3f8..ebbd15d 100644 --- a/tasks/certificates_certbot.yml +++ b/tasks/certificates_certbot.yml @@ -1,14 +1,14 @@ - name: Create certbot certs copy: remote_src: true - src: "/etc/letsencrypt/live/nextcloud.equilibrateit.test/privkey.pem" - dest: "/home/nextcloud/nginx/certs/{{ inventory_hostname }}.key" - owner: 100999 - group: 100999 + src: "/etc/letsencrypt/live/{{ inventory_hostname }}/privkey.pem" + dest: "/home/{{ user.name }}/proxy/certs/{{ inventory_hostname }}.key" + owner: 100033 + group: 100033 - copy: remote_src: true - src: "/etc/letsencrypt/live/nextcloud.equilibrateit.test/fullchain.pem" - dest: "/home/nextcloud/nginx/certs/{{ inventory_hostname }}.crt" - owner: 100999 - group: 100999 + src: "/etc/letsencrypt/live/{{ inventory_hostname }}/fullchain.pem" + dest: "/home/{{ user.name }}/proxy/certs/{{ inventory_hostname }}.crt" + owner: 100033 + group: 100033 diff --git a/tasks/certificates_self.yml b/tasks/certificates_self.yml index 4dc64b0..7ad1e60 100644 --- a/tasks/certificates_self.yml +++ b/tasks/certificates_self.yml @@ -2,8 +2,8 @@ become: yes become_user: nextcloud command: - chdir: /home/nextcloud/ - creates: "/home/nextcloud/{{ inventory_hostname }}.key" + chdir: /home/{{ user.name }}/ + creates: "/home/{{ user.name }}/{{ inventory_hostname }}.key" argv: - openssl - req @@ -40,16 +40,16 @@ - copy: - src: "/home/nextcloud/{{ inventory_hostname }}.crt" + src: "/home/{{ user.name }}/{{ inventory_hostname }}.crt" remote_src: true - dest: /home/nextcloud/nginx/certs/ - owner: 100999 + dest: /home/{{ user.name }}/proxy/certs/ + owner: 100033 - copy: - src: "/home/nextcloud/{{ inventory_hostname }}.key" + src: "/home/{{ user.name }}/{{ inventory_hostname }}.key" remote_src: true - dest: /home/nextcloud/nginx/certs/ - owner: 100999 + dest: /home/{{ user.name }}/proxy/certs/ + owner: 100033 - file: path: "/home/nextcloud/{{ item }}" @@ -57,4 +57,4 @@ with_items: - "{{ inventory_hostname }}.normal.crt" - "{{ inventory_hostname }}.crt" - #- "{{ inventory_hostname }}.key" + - "{{ inventory_hostname }}.key" diff --git a/tasks/files.yml b/tasks/files.yml index c65b13f..0cd4b71 100644 --- a/tasks/files.yml +++ b/tasks/files.yml @@ -2,26 +2,28 @@ file: path: "/home/{{ user.name }}/{{ subdir }}" state: directory - owner: "100999" - group: "100999" + owner: "100033" + group: "100033" with_items: - "webroot" - - "nginx/certs" - - "nginx/conf.d" + - "web" + - "proxy/certs" + - "proxy/conf.d" + - "proxy/vhost.d" loop_control: loop_var: "subdir" -- name: Create NGINX Conf File +- name: Create proxy uploadsize.conf File template: - src: "default.conf.j2" - dest: "/home/{{ user.name }}/nginx/conf.d/default.conf" + src: "proxy/uploadsize.conf" + dest: "/home/{{ user.name }}/proxy/conf.d/uploadsize.conf" owner: "{{ user.name }}" group: "{{ user.name }}" -- name: Create NGINX Dockerfile - copy: - src: "nginx/Dockerfile" - dest: "/home/{{ user.name }}/nginx/Dockerfile" +- name: Create web nginx.conf File + template: + src: "nginx.conf" + dest: "/home/{{ user.name }}/web/nginx.conf" owner: "{{ user.name }}" group: "{{ user.name }}" diff --git a/templates/default.conf.j2 b/templates/default.conf.j2 deleted file mode 100644 index 2f682e7..0000000 --- a/templates/default.conf.j2 +++ /dev/null @@ -1,175 +0,0 @@ - upstream php-handler { - zone backends 64k; - server 127.0.0.1:9000; - } - - map $arg_v $asset_immutable { - "" ""; - default ", immutable"; - } - - server { - listen 80; - server_name {{ inventory_hostname | default('ansible_undefined_host') }}; - - return 301 https://$server_name$request_uri/; - } - server { - listen 443 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 6cdc81c..38f02b3 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -1,4 +1,17 @@ services: + db: + # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server + image: postgres:alpine + restart: always + volumes: + - db:/var/lib/postgresql/data:Z + env_file: + - .db.env + + redis: + image: redis:alpine + restart: always + app: image: nextcloud:stable-fpm hostname: app @@ -8,8 +21,6 @@ services: volumes: - /home/{{ user.name }}/webroot:/var/www/html environment: - - VIRTUAL_HOST={{ inventory_hostname | default('ansible_undefined_host') }} - - VIRTUAL_PROTO=fastcgi - NEXTCLOUD_ADMIN_USER=admin - POSTGRES_DATABASE=nextcloud - POSTGRES_HOST=db:5432 @@ -21,31 +32,60 @@ services: default: aliases: - "nextcloud.local" + depends_on: + - db + - redis + - proxy - nginx: - 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 + web: + image: nginx:alpine-slim + restart: always + volumes: + # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html + - /home/{{ user.name }}/web/nginx.conf:/etc/nginx/nginx.conf:ro + # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing) + - /home/{{ user.name }}/webroot:/var/www/html:z,ro + environment: + - VIRTUAL_HOST={{ inventory_hostname | default('ansible_undefined_host') }} + - LETSENCRYPT_HOST={{ inventory_hostname | default('ansible_undefined_host') }} + - LETSENCRYPT_EMAIL="admin@libre.audio" + depends_on: + - app networks: - default: - volumes: - - ~/nginx/certs:/etc/nginx/certs:z,ro - - ~/nginx/conf.d:/etc/nginx/conf.d:z,ro + - proxy-tier + - default - db: - image: postgres:alpine - hostname: db + cron: + image: nextcloud:fpm-alpine restart: always volumes: - - db:/var/lib/postgresql/data:Z - env_file: - - .db.env + - /home/{{ user.name }}/webroot:/var/www/html:z + # NOTE: The `volumes` config of the `cron` and `app` containers must match + entrypoint: /cron.sh + depends_on: + - db + - redis - redis: - image: redis:alpine - hostname: redis + # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences. + proxy: restart: always + ports: + - 8080:80 + - 4443:443 + labels: + - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" + volumes: + - /home/{{ user.name }}/proxy/certs:/etc/nginx/certs:z,ro + - /home/{{ user.name }}/proxy/conf.d:/etc/nginx/conf.d:z + - /home/{{ user.name }}/proxy/vhost.d:/etc/nginx/vhost.d:z + - proxy_html:/usr/share/nginx/html:z + - /run/user/{{ getent_passwd[item.name][2] }}/podman/podman.sock:/tmp/docker.sock:ro + networks: + - proxy-tier volumes: db: + proxy_html: + +networks: + proxy-tier: diff --git a/templates/proxy/uploadsize.conf b/templates/proxy/uploadsize.conf new file mode 100644 index 0000000..7e3906e --- /dev/null +++ b/templates/proxy/uploadsize.conf @@ -0,0 +1,2 @@ +client_max_body_size 10G; +proxy_request_buffering off; diff --git a/templates/web/nginx.conf b/templates/web/nginx.conf new file mode 100644 index 0000000..e69de29