diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 deleted file mode 100644 index d10c3b4..0000000 --- a/templates/docker-compose.yml.j2 +++ /dev/null @@ -1,100 +0,0 @@ -services: - - db: - image: postgres:alpine - restart: always - hostname: db - environment: - POSTGRES_DB: "nextcloud" - volumes: - - db:/var/lib/postgresql/data:Z - env_file: - - .db.env - - redis: - image: redis:alpine - restart: always - - app: - image: nextcloud:fpm-alpine - restart: always - ports: - - 9000:9000 - env_file: - - .webserver.env - environment: - NEXTCLOUD_ADMIN_USER: "admin" - POSTGRES_DB: "nextcloud" - POSTGRES_USER: "postgres" - POSTGRES_HOST: "db" - REDIS_HOST: "redis" - NEXTCLOUD_TRUSTED_DOMAINS: "{{ inventory_hostname | default('ansible_undefined_fact') }}" - volumes: - - ~/webroot:/var/www/html - # NOTE: The `volumes` config of the `cron` and `app` containers must match - env_file: - - .webserver.env - depends_on: - - db - - redis - - proxy - - # Note: Nginx is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/nginx/ - web: - image: nginx:alpine-slim - restart: always - volumes: - # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html - - ./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) - - ~/webroot:/var/www/html:z,ro - environment: - - VIRTUAL_HOST= - - LETSENCRYPT_HOST= - - LETSENCRYPT_EMAIL= - depends_on: - - app - networks: - - proxy-tier - - default - - cron: - image: nextcloud:fpm-alpine - restart: always - volumes: - - ~/webroot:/var/www/html - # NOTE: The `volumes` config of the `cron` and `app` containers must match - entrypoint: /cron.sh - depends_on: - - db - - redis - - # Note: Nginx-proxy is an external service. You can find more information about the configuration here: - # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences. - # https://hub.docker.com/r/nginxproxy/nginx-proxy - proxy: - image: nginxproxy/nginx-proxy:alpine - restart: unless-stopped - ports: - - 8080:8080 - - 4443:4443 - environment: - HTTP_PORT: 8080 - HTTPS_PORT: 4443 - labels: - - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" - volumes: - - /home/{{ user.name }}/nginx/vhost.d:/etc/nginx/vhost.d - - /home/{{ user.name }}/nginx/certs:/etc/nginx/certs - - /run/user/1000/podman/podman.sock:/tmp/docker.sock:z,ro - networks: - - proxy-tier - - -volumes: - db: - -networks: - default: - proxy-tier: diff --git a/templates/nginx-vhost.j2 b/templates/nginx-vhost.j2 deleted file mode 100644 index abcab57..0000000 --- a/templates/nginx-vhost.j2 +++ /dev/null @@ -1 +0,0 @@ -fastcgi_index index.php; diff --git a/templates/web/nginx.conf.j2 b/templates/web/nginx.conf.j2 index f3f9064..eec7353 100644 --- a/templates/web/nginx.conf.j2 +++ b/templates/web/nginx.conf.j2 @@ -1,202 +1,112 @@ -worker_processes auto; +services: + # Note: PostgreSQL is an external service. You can find more information about the configuration here: + # https://hub.docker.com/_/postgres + 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 -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; + # Note: Redis is an external service. You can find more information about the configuration here: + # https://hub.docker.com/_/redis + redis: + image: redis:alpine + restart: always + app: + image: nextcloud:fpm-alpine + restart: always + volumes: + - nextcloud:/var/www/html:z + # NOTE: The `volumes` config of the `cron` and `app` containers must match + environment: + - POSTGRES_HOST=db + - REDIS_HOST=redis + env_file: + - .db.env + depends_on: + - db + - redis + - proxy -events { - worker_connections 1024; -} + # Note: Nginx is an external service. You can find more information about the configuration here: + # https://hub.docker.com/_/nginx/ + web: + image: nginx:alpine-slim + restart: always + volumes: + # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html + - ./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) + - nextcloud:/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: + - proxy-tier + - default + cron: + image: nextcloud:fpm-alpine + restart: always + volumes: + - nextcloud:/var/www/html:z + # NOTE: The `volumes` config of the `cron` and `app` containers must match + entrypoint: /cron.sh + depends_on: + - db + - redis -http { - include mime.types; - default_type application/octet-stream; - types { - text/javascript mjs; - } + # Note: Nginx-proxy is an external service. You can find more information about the configuration here: + # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences. + # https://hub.docker.com/r/nginxproxy/nginx-proxy + proxy: + build: ./proxy + restart: always + ports: + - 80:80 + - 443:443 + labels: + - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" + volumes: + - certs:/etc/nginx/certs:z,ro + - vhost.d:/etc/nginx/vhost.d:z + - html:/usr/share/nginx/html:z + - /var/run/docker.sock:/tmp/docker.sock:z,ro + networks: + - proxy-tier - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; + # Note: Letsencrypt companion is an external service. You can find more information about the configuration here: + # https://hub.docker.com/r/nginxproxy/acme-companion + letsencrypt-companion: + image: nginxproxy/acme-companion + restart: always + volumes: + - certs:/etc/nginx/certs:z + - acme:/etc/acme.sh:z + - vhost.d:/etc/nginx/vhost.d:z + - html:/usr/share/nginx/html:z + - /var/run/docker.sock:/var/run/docker.sock:z,ro + environment: + - DEFAULT_EMAIL="admin@libre.audio" + networks: + - proxy-tier + depends_on: + - proxy - access_log /var/log/nginx/access.log main; +volumes: + db: + nextcloud: + certs: + acme: + vhost.d: + html: - sendfile on; - #tcp_nopush on; - - # Prevent nginx HTTP Server Detection - server_tokens off; - - keepalive_timeout 65; - - # Set the `immutable` cache control options only for assets with a cache busting `v` argument - map $arg_v $asset_immutable { - "" ""; - default ", immutable"; - } - - #gzip on; - - resolver 127.0.0.11 valid=2s; - upstream php-handler { - zone backends 64k; - server app:9000 resolve; - } - - 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 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; - } - } -} +networks: + proxy-tier: