Updated nextcloud to use docker network and caddy

nextcloud/files/nginx.conf.j2

@@ -1,20 +0,0 @@
-server {
-
-  listen 80;
-  server_name {{ http_host }};
-
-  # set max upload size
-  client_max_body_size 10G;
-
-  location / {
-
-    proxy_set_header Host                $host:$server_port;
-    proxy_set_header X-Scheme            $scheme;
-    proxy_set_header X-Forwarded-For     $remote_addr;
-    add_header X-Robots-Tag              "noindex, nofollow, nosnippet, noarchive" always;
-    add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
-    proxy_pass       http://localhost:9080;
-  }
-
-}
-

nextcloud/playbook.yml

@@ -2,12 +2,12 @@
 # DO Community Playbooks: Nextcloud
 #################################################
 ---
-- hosts: gondor
+- hosts: monoco
   become: true
   vars_files:
     - vars/default.yml
 
   roles:
+  - network
   - nextcloud
-  - webserver
+  - caddy
-  - nginx

nextcloud/roles/caddy/handlers/main.yaml

@@ -0,0 +1,5 @@
+---
+# Handlers for Caddy role
+- name: Reload Caddy configuration
+  ansible.builtin.command: "docker exec -w /etc/caddy {{ caddy_container }} caddy reload"
+  listen: "Reload Caddy"

nextcloud/roles/caddy/tasks/main.yaml

@@ -0,0 +1,22 @@
+---
+- name: Read current Caddyfile
+  ansible.builtin.slurp:
+    path: "{{ caddyfile_path }}"
+  register: caddyfile_raw
+
+- name: Decode Caddyfile content
+  set_fact:
+    caddyfile_content: "{{ caddyfile_raw['content'] | b64decode }}"
+
+- name: Check if snippet already exists
+  set_fact:
+    snippet_present: "{{ snippet_block in caddyfile_content }}"
+
+- name: Add snippet if missing
+  ansible.builtin.blockinfile:
+    path: "{{ caddyfile_path }}"
+    marker: "# {mark} Ansible managed Caddy snippet for {{ host }}"
+    block: "{{ snippet_block }}"
+    create: yes
+  when: not snippet_present
+  notify: "Reload Caddy"

nextcloud/roles/network/tasks/main.yaml

@@ -0,0 +1,11 @@
+---
+- name: "Ensure {{ container_name }} Docker network exists"
+  docker_network:
+    name: "{{ docker_network }}"
+    state: present
+    connected:
+      - "{{ caddy_container }}"
+      - "{{ postgres_container }}"
+      - name: "{{ redis_container }}"
+        alias: redis
+    appends: yes

nextcloud/roles/nextcloud/tasks/main.yaml

@@ -24,11 +24,8 @@
       POSTGRES_PASSWORD: "{{ db_pass }}"
       POSTGRES_HOST: "{{ db_host }}"
       REDIS_HOST: "redis"
-    links:
+    networks:
-      - "postgres:db"
+      - name: "{{ docker_network }}"
-      - "redis:redis"
-    published_ports:
-      - "127.0.0.1:9000:9000"
     volumes:
       - "/var/lib/{{ host_directory }}:/var/www/html"
 

nextcloud/roles/nginx/handlers/main.yaml

@@ -1,6 +0,0 @@
----
-# Handlers for Nginx role
-- name: Reload Nginx
-  service:
-    name: nginx
-    state: reloaded

nextcloud/roles/nginx/tasks/main.yaml

@@ -1,24 +0,0 @@
----
-# Tasks for Nginx role
-- name: Check if Nginx conf file exists
-  stat:
-    path: "/etc/nginx/sites-available/{{ http_conf }}"
-  register: status
-
-- name: No need to reload Nginx
-  debug:
-    msg: "No need to reload Nginx as sites-available entries have already been created"
-
-- name: Set Nginx conf file
-  when: status.stat.exists == false
-  template:
-    src: "files/nginx.conf.j2"
-    dest: "/etc/nginx/sites-available/{{ http_conf }}"
-
-- name: Enable new site
-  when: status.stat.exists == false
-  file:
-    src: "/etc/nginx/sites-available/{{ http_conf }}"
-    dest: "/etc/nginx/sites-enabled/{{ http_conf }}"
-    state: link
-  notify: Reload Nginx

nextcloud/roles/webserver/tasks/main.yaml

@@ -1,28 +0,0 @@
----
-# Tasks for Nextcloud webserver role
-- name: Copy dockerfile
-  synchronize: src=web dest=/tmp
-
-- name: Build nginx webserver image
-  docker_image:
-    name: "{{ web_container_image }}"
-    build:
-      path: /tmp/web/
-      dockerfile: /tmp/web/Dockerfile
-      pull: yes
-    state: present
-    source: build
-    force_source: yes
-
-- name: Create webserver container
-  docker_container:
-    name: "{{ web_container_name }}"
-    image: "{{ web_container_image }}"
-    state: started
-    restart_policy: "unless-stopped"
-    links:
-      - "{{ container_name }}:app"
-    published_ports:
-      - "127.0.0.1:9080:80"
-    volumes:
-      - "/var/lib/{{ host_directory }}:/var/www/html:ro"

nextcloud/vars/default.yml

@@ -1,12 +1,24 @@
 ---
-http_host: "cloud.hopsngrains.com"
+container_name: nextcloud
-http_conf: "cloud.hopsngrains.com.conf"
+container_image: nextcloud:latest
 
-container_name: cloud
+docker_network: nextcloud_net
-container_image: nextcloud:fpm
 
-web_container_name: cloud-web
+postgres_container: postgres
-web_container_image: nextcloud-web
+caddy_container: caddy
+redis_container: valkey
+
+host: cloud.hopsngrains.com
+
+caddyfile_path: /var/lib/caddy/conf/Caddyfile
+snippet_block: |
+  {{ host }} {
+      reverse_proxy {{ container_name }}:80
+
+      header {
+          Strict-Transport-Security "max-age=15552000; includeSubDomains; preload"
+      }
+  }
 
 host_directory: nextcloud
 

nextcloud/web/Dockerfile

@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf

nextcloud/web/nginx.conf

@@ -1,218 +0,0 @@
-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;
-
-    set_real_ip_from  10.0.0.0/8;
-    set_real_ip_from  172.16.0.0/12;
-    set_real_ip_from  192.168.0.0/16;
-    real_ip_header    X-Forwarded-For;
-
-    # Set the `immutable` cache control options only for assets with a cache busting `v` argument
-    map $arg_v $asset_immutable {
-        "" "";
-        default "immutable";
-    }
-
-    #gzip  on;
-
-    upstream php-handler {
-        server 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;
-        proxy_request_buffering off;
-        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, nosnippet, noarchive" 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 $http_x_scheme://$http_host/remote.php/dav; }
-            location = /.well-known/caldav  { return 301 $http_x_scheme://$http_host/remote.php/dav; }
-
-            location = /.well-known/webfinger {
-                return 301 $http_x_scheme://$http_host/index.php/.well-known/webfinger;
-            }
-            location = /.well-known/nodeinfo  {
-                return 301 $http_x_scheme://$http_host/index.php/.well-known/nodeinfo;
-            }
-
-            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;
-
-            fastcgi_max_temp_file_size 0;
-        }
-
-        # Javascript mimetype fixes for nginx
-        # Note: The block below should be removed, and the js|mjs section should be
-        # added to the block below this one. This is a temporary fix until Nginx
-        # upstream fixes the js mime-type
-        location ~* \.(?:js|mjs)$ {
-            types {
-                text/javascript js mjs;
-            }
-            try_files $uri /index.php$request_uri;
-            add_header Cache-Control "public, max-age=15778463, $asset_immutable";
-            access_log off;
-        }
-
-        # Serve static files
-        location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
-            try_files $uri /index.php$request_uri;
-            add_header Cache-Control "public, max-age=15778463, $asset_immutable";
-            access_log off;     # Optional: Don't log access to assets
-
-            location ~ \.wasm$ {
-                default_type application/wasm;
-            }
-        }
-
-        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;
-        }
-    }
-}