README.md

@@ -7,17 +7,15 @@ and managing nextcloud installations
 
 ## Roles
 
-- [`server`](roles/server/README.md): For deploying
+- [`roles/server`](roles/server/README.md): For deploying
   and configuring a bare nextcloud instance in a docker container.
   Supports both the `-apache` (default) and `-fpm` variants.
-- [`apps`](roles/apps/README.md):
+- [`roles/apps`](roles/apps/README.md):
   For managing nextcloud apps in an already installed nextcloud
   server instance. Can install, remove, enable/disable and update apps.
-- [`ldap_user_backend`](roles/ldap_user_backend/README.md):
+- [`roles/ldap-user-backend`](roles/ldap-user-backend/README.md):
   Manages LDAP authentication sources in installed nextcloud instances.
-- [`oidc_user_backend`](roles/oidc_user_backend/README.md):
+- [`roles/nginx-fpm-proxy`](roles/nginx-fpm-proxy/README.md):
-  Manage OIDC authentication sources in installed nextcloud instances.
-- [`nginx_fpm_proxy`](roles/nginx_fpm_proxy/README.md):
   Reverse proxy role which connects to nextcloud using FPM
   and serves static content.
 

galaxy.yml

@@ -1,18 +1,15 @@
 namespace: finallycoffee
 name: nextcloud
-version: 0.7.2
+version: 0.5.0
 readme: README.md
 authors:
-- transcaffeine <transcaffeine@finally.coffee>
+- Johanna Dorothea Reichmann <transcaffeine@finallycoffee.eu>
 description: Installing and configuring nextcloud (and related apps/services) using docker
 dependencies:
-  "community.docker": "^3.0.0"
+  "community.docker": "^1.10.0"
-license_file: LICENSE.md
+license:
+- CNPLv7+
 build_ignore:
 - '*.tar.gz'
-repository: https://git.finally.coffee/finallycoffee/nextcloud
+repository: https://git.finallycoffee.eu/finallycoffee.eu/nextcloud
-issues: https://codeberg.org/finallycoffee/ansible-collection-nextcloud/issues
+issues: https://git.finallycoffee.eu/finallycoffee.eu/nextcloud/issues
-tags:
-  - nextcloud
-  - nextcloud_apps
-  - docker

meta/runtime.yml

@@ -1,3 +0,0 @@
----
-
-requires_ansible: ">=2.15"

roles/apps/handlers/main.yml

@@ -1,9 +1,7 @@
 ---
 
 - name: restart-nextcloud
-  community.docker.docker_container:
+  docker_container:
     name: "{{ nextcloud_container_name }}"
     state: started
-    restart: true
+    restart: yes
-    comparisons:
-      '*': ignore

roles/apps/meta/main.yml

@@ -1,12 +0,0 @@
----
-allow_duplicates: true
-dependencies: []
-galaxy_info:
-  role_name: apps
-  description: Install Nextcloud apps using ansible
-  galaxy_tags:
-    - nextcloud
-    - owncloud
-    - apps
-    - nextcloud-apps
-    - docker

roles/apps/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Ensure nextcloud user is created
-  ansible.builtin.user:
+  user:
     name: "{{ nextcloud_run_user }}"
     state: present
   register: nextcloud_user_res

roles/ldap-user-backend/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+collections:
+  - community.docker

roles/ldap-user-backend/tasks/load_config_http.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Set default api parameters for HTTP
-  ansible.builtin.meta: noop
+  meta: noop
   vars: &api_defaults
     http_agent: "{{ nc_ldap_meta_http_agent }}"
     headers: "{{ nc_ldap_api_headers }}"
@@ -11,7 +11,7 @@
     force: yes
 
 - name: Check if configuration with given config ID already exists
-  ansible.builtin.uri:
+  uri:
     <<: *api_defaults
     url: "{{ nc_ldap_api_path }}/{{ nc_ldap_config_id }}{{ query_params }}"
     method: GET
@@ -21,19 +21,19 @@
 
 # TODO: Can we force an ID on POST?
 - name: Create ldap configuration with id={{ nc_ldap_config_id }}
-  ansible.builtin.uri:
+  uri:
     <<: *api_defaults
     url: "{{ nc_ldap_api_path }}"
     method: POST
   when: nc_ldap_existing_config_api.status != 200
 
 - name: Parse output of query command to dict
-  ansible.builtin.set_fact:
+  set_fact:
     nc_ldap_existing_config: "{{ nc_ldap_existing_config_api.stdout | from_json }}"
   changed_when: false
 
 - name: Create changeset
-  ansible.builtin.set_fact:
+  set_fact:
     nc_ldap_config_changeset: "{{ nc_ldap_config_changeset | combine(changed_entry) }}"
   vars:
     changed_entry: "{{ { item : nc_ldap_config_keys[item] } }}"
@@ -41,7 +41,7 @@
   when: nc_ldap_config_keys[item] is defined and nc_ldap_config_keys[item] and nc_ldap_config_keys[item] != nc_ldap_existing_config[nc_ldap_config_id][item]
 
 - name: Ensure ldap configuration is in sync (http)
-  ansible.builtin.uri:
+  uri:
     <<: *api_defaults
     url: "{{ nc_lap_api_path }}/{{ nc_ldap_config_id }}"
     method: PUT

roles/ldap-user-backend/tasks/load_config_occ.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Check if configuration with given config ID already exists
-  community.docker.docker_container_exec:
+  docker_container_exec:
     container: "{{ nc_ldap_container }}"
     command: "{{ nc_ldap_occ_command }} ldap:show-config --output json {{ '--show-password' if nc_ldap_config_agent_password else '' }} {{ nc_ldap_config_id }}"
     user: "{{ nc_ldap_occ_user }}"
@@ -11,7 +11,7 @@
   register: nc_ldap_existing_config_occ
 
 - name: Create ldap configuration with id={{ nc_ldap_config_id }}
-  community.docker.docker_container_exec:
+  docker_container_exec:
     container: "{{ nc_ldap_container }}"
     command: "{{ nc_ldap_occ_command }} ldap:create-empty-config --output json {{ nc_ldap_config_id }}"
     user: "{{ nc_ldap_occ_user }}"
@@ -19,12 +19,12 @@
   when: nc_ldap_existing_config_occ.rc != 0 and nc_ldap_config_id not in (nc_ldap_existing_config_occ.stdout | from_json).keys()
 
 - name: Parse output of query command to dict
-  ansible.builtin.set_fact:
+  set_fact:
     nc_ldap_existing_config: "{{ nc_ldap_existing_config_occ.stdout | from_json }}"
   changed_when: false
 
 - name: Create changeset
-  ansible.builtin.set_fact:
+  set_fact:
     nc_ldap_config_changeset: "{{ nc_ldap_config_changeset | combine(changed_entry) }}"
   vars:
     changed_entry: "{{ { item : nc_ldap_config_keys[item] } }}"
@@ -32,7 +32,7 @@
   when: nc_ldap_config_keys[item] is defined and nc_ldap_config_keys[item] and nc_ldap_config_keys[item] != nc_ldap_existing_config[nc_ldap_config_id][item]
 
 - name: Ensure ldap configuration is in sync
-  community.docker.docker_container_exec:
+  docker_container_exec:
     container: "{{ nc_ldap_container }}"
     command: "{{ nc_ldap_occ_command }} ldap:set-config \"{{ nc_ldap_config_id }}\" \"{{ item.key }}\" \"{{ item.value }}\""
     user: "{{ nc_ldap_occ_user }}"
@@ -40,7 +40,7 @@
   loop: "{{ nc_ldap_config_changeset | dict2items }}"
 
 - name: Ensure ldap configuration is working
-  community.docker.docker_container_exec:
+  docker_container_exec:
     container: "{{ nc_ldap_container }}"
     command: "{{ nc_ldap_occ_command }} ldap:test-config {{ nc_ldap_config_id }}"
     user: "{{ nc_ldap_occ_user }}"

roles/ldap-user-backend/tasks/main.yml

@@ -1,10 +1,10 @@
 ---
 
 - name: Load config {{ nc_ldap_config_id }} (and create if not exists) when running mode is http
-  ansible.builtin.include_tasks: load_config_http.yml
+  include_tasks: load_config_http.yml
   when: nc_ldap_api_method == 'http'
 
 - name: Load config {{ nc_ldap_config_id }} (and create if not exists) when running mode is occ
-  ansible.builtin.include_tasks: load_config_occ.yml
+  include_tasks: load_config_occ.yml
   when: nc_ldap_api_method == 'occ'
 

roles/ldap_user_backend/meta/main.yml

@@ -1,12 +0,0 @@
----
-allow_duplicates: true
-dependencies: []
-galaxy_info:
-  role_name: ldap_user_backend
-  description: Configure a nextcloud ldap user backend using ansible
-  galaxy_tags:
-    - nextcloud
-    - owncloud
-    - ldap
-    - authentication
-    - docker

roles/nginx-fpm-proxy/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 
-nextcloud_nginx_version: "1.25.3"
+nextcloud_nginx_version: "1.21.3"
 nextcloud_nginx_basepath: /opt/nextcloud-nginx
 nextcloud_nginx_config: "{{ nextcloud_nginx_basepath }}/nextcloud.conf"
 nextcloud_nginx_servernames: ~

roles/nginx-fpm-proxy/tasks/main.yml

@@ -1,13 +1,13 @@
 ---
 
 - name: Create directory for nginx config
-  ansible.builtin.file:
+  file:
     path: "{{ nextcloud_nginx_basepath }}"
     state: directory
     mode: 0750
 
 - name: Template nginx reverse proxy config for nextcloud
-  ansible.builtin.template:
+  template:
     src: nextcloud-nginx.conf.j2
     dest: "{{ nextcloud_nginx_config }}"
   vars:
@@ -18,20 +18,19 @@
   notify: restart-nextcloud-nginx
 
 - name: Ensure nginx docker image is pulled
-  community.general.docker_image:
+  docker_image:
     name: "{{ nextcloud_nginx_container_image_ref }}"
     state: present
     source: pull
     force_source: "{{ nextcloud_nginx_container_image_force_pull }}"
 
 - name: Ensure nginx is running for FPM and static file serving
-  community.docker.docker_container:
+  docker_container:
-    env: "{{ nextcloud_nginx_container_env }}"
     name: "{{ nextcloud_nginx_container_name }}"
     image: "{{ nextcloud_nginx_container_image_ref }}"
-    ports: "{{ nextcloud_nginx_container_ports  | default(omit, true) }}"
     volumes: "{{ nextcloud_nginx_container_volumes }}"
-    labels: "{{ nextcloud_nginx_container_labels | default(omit, true) }}"
+    labels: "{{ nextcloud_nginx_container_labels }}"
-    networks: "{{ nextcloud_nginx_container_networks | default(omit, true) }}"
+    env: "{{ nextcloud_nginx_container_env }}"
+    networks: "{{ nextcloud_nginx_container_networks | default(omit) }}"
     restart_policy: "{{ nextcloud_nginx_container_restart_policy }}"
     state: started

roles/nginx-fpm-proxy/templates/nextcloud-nginx.conf.j2

@@ -1,12 +1,6 @@
 upstream php-handler {
 {% if fpm_socket %}
-{% if fpm_socket is not string %}
-{% for upstream in fpm_socket %}
-    server unix:{{ upstream }};
-{% endfor %}
-{% else %}
     server unix:{{ fpm_socket }};
-{% endif %}
 {% else %}
     server {{ fpm_server }}:{{ fpm_server_port }};
 {% endif %}
@@ -17,79 +11,29 @@ server {
     listen [::]:80;
     server_name {{ domain | join(' ') }};
 
-    # Path to the root of your installation
-    root /var/www/nextcloud;
-
     # Add headers to serve security related headers
     # Before enabling Strict-Transport-Security headers please read into this
     # topic first.
     add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
-
+    #
-    # Prevent nginx HTTP Server Detection
+    # WARNING: Only add the preload option once you read about
-    server_tokens off;
+    # the consequences in https://hstspreload.org/. This option
-
+    # will add the domain to a hardcoded list that is shipped
-    # set max upload size
+    # in all major browsers and getting removed from this list
-    client_max_body_size {{ nextcloud_php_upload_limit }};
+    # could take several months.
-    client_body_timeout 300s;
-    fastcgi_buffers 128 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;
-
-    # Uncomment if your server is build with the ngx_pagespeed module
-    # This module is currently not supported.
-    #pagespeed off;
-
-    # 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;
-
-    # 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-Download-Options "noopen" 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-Robots-Tag "none" 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;
 
-    # Set .mjs and .wasm MIME types
+    # Path to the root of your installation
-    # Either include it in the default mime.types list
+    root /var/www/nextcloud;
-    # and include that list explicitly or add the file extension
-    # only for Nextcloud like below:
-    include mime.types;
-    types {
-        text/javascript js;
-	application/javascript mjs;
-	application/wasm wasm;
-    }
-
-    # 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`, `/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;
@@ -105,55 +49,81 @@ server {
         # The rules in this block are an adaptation of the rules
         # in `.htaccess` that concern `/.well-known`.
 
-        location = /.well-known/carddav { return 301 https://$host/remote.php/dav; }
+        location = /.well-known/carddav { return 301 https://$host/remote.php/dav/; }
-        location = /.well-known/caldav  { return 301 https://$host/remote.php/dav; }
+        location = /.well-known/caldav  { return 301 https://$host/remote.php/dav/; }
 
-        location = /.well-known/webfinger  { return 301 https://$host/index.php/.well-known/webfinger; }
+        # The following rule is only needed for the Social app.
-        location = /.well-known/nodeinfo   { return 301 https://$host/index.php/.well-known/nodeinfo; }
+        # Uncomment it if you're planning to use this app.
+        location = /.well-known/webfinger	{ return 301 https://$host/public.php?service=webfinger; }
+
+        # The following 2 rules are only needed for the user_webfinger app.
+        # Uncomment it if you're planning to use this app.
+        location = /.well-known/host-meta	{ return 301 https://$host/public.php?service=host-meta; }
+        location = /.well-known/host-meta.json	{ return 301 https://$host/public.php?service=host-meta-json; }
 
         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;
+        return 301 https://$host/index.php$request_uri;
     }
 
-    # Rules borrowed from `.htaccess` to hide certain paths from clients
+    # set max upload size
-    location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)  { return 404; }
+    client_max_body_size {{ nextcloud_php_upload_limit }};
-    location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)                { return 404; }
+    fastcgi_buffers 128 4K;
 
-    # Ensure this block, which passes PHP files to the PHP process, is above the blocks
+    # Enable gzip but do not remove ETag headers
-    # which handle static assets (as seen below). If this block is not declared first,
+    gzip on;
-    # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
+    gzip_vary on;
-    # to the URI, resulting in a HTTP 500 error response.
+    gzip_comp_level 4;
-    location ~ \.php(?:$|/) {
+    gzip_min_length 256;
-        # Required for legacy support
+    gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
-        rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
+    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;
 
-        fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+    # Uncomment if your server is build with the ngx_pagespeed module
+    # This module is currently not supported.
+    #pagespeed off;
+
+    location / {
+        rewrite ^ /index.php;
+    }
+
+    location ~ ^\/(?:build|tests|config|lib|3rdparty|templates|data)\/ {
+        deny all;
+    }
+    location ~ ^\/(?:\.|autotest|occ|issue|indie|db_|console) {
+        deny all;
+    }
+
+    location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy)\.php(?:$|\/) {
+        fastcgi_split_path_info ^(.+?\.php)(\/.*|)$;
         set $path_info $fastcgi_path_info;
-
         try_files $fastcgi_script_name =404;
-
-        include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME /var/www/html$fastcgi_script_name;
+        fastcgi_param SCRIPT_NAME $fastcgi_script_name;
         fastcgi_param PATH_INFO $path_info;
-        fastcgi_param HTTPS on;
+        fastcgi_param HTTPS $https;
-
+        fastcgi_param HTTP_PROXY "";
-        fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
+        fastcgi_param REMOTE_ADDR $remote_addr;
-        fastcgi_param front_controller_active true;     # Enable pretty urls
+        # Avoid sending the security headers twice
+        fastcgi_param modHeadersAvailable true;
+        # Enable pretty urls
+        fastcgi_param front_controller_active true;
         fastcgi_pass php-handler;
-
+        include fastcgi_params;
         fastcgi_intercept_errors on;
         fastcgi_request_buffering off;
+    }
 
-        fastcgi_max_temp_file_size 0;
+    location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) {
+        try_files $uri/ =404;
+        index index.php;
     }
 
     # Adding the cache control header for js, css and map files
     # Make sure it is BELOW the PHP block
-    location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
+    location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
         expires 1d;
         # How `sendfile`, `tcp_nopush` and `tcp_nodelay` interact
         # https://thoughts.t37.net/nginx-optimization-understanding-sendfile-tcp-nodelay-and-tcp-nopush-c55cdd276765?gi=f11af534b564
@@ -189,19 +159,16 @@ server {
         access_log off;
     }
 
-
+    location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$ {
-    location ~ \.woff2?$ {
+        expires 1d;
+        sendfile on;
+        tcp_nopush on;
+        tcp_nodelay on;
+        open_file_cache max=10000;
+        open_file_cache_valid 3600s;
+        open_file_cache_errors off;
         try_files $uri /index.php$request_uri;
-        expires 7d;         # Cache-Control policy borrowed from `.htaccess`
+        # Optional: Don't log access to other assets
-        access_log off;     # Optional: Don't log access to assets
+        access_log off;
-    }
-
-    # Rule borrowed from `.htaccess`
-    location /remote {
-        return 301 /remote.php$request_uri;
-    }
-
-    location / {
-        try_files $uri $uri/ /index.php$request_uri;
     }
 }

roles/nginx_fpm_proxy/meta/main.yml

@@ -1,12 +0,0 @@
----
-allow_duplicates: true
-dependencies: []
-galaxy_info:
-  role_name: nginx_fpm_proxy
-  description: Configure nginx as a FPM proxy for nextcloud
-  galaxy_tags:
-    - nextcloud
-    - owncloud
-    - nginx
-    - fpm
-    - docker

roles/oidc_user_backend/README.md

@@ -1,26 +0,0 @@
-# `finallycoffee.nextcloud.oidc_user_backend` ansible role
-
-Configure OIDC user backends in nextcloud using this ansible role.
-This role can be run multiple times with different arguments in order to
-configure multiple oidc-based user backends.
-
-## Configuration
-
-Set `oidc_user_backend_provider_identifier` to a unique identifier.
-Populate your provider information in the `oidc_user_backend_config_provider_provider_(settings_)`
-like this:
-
-```yaml
-oidc_user_backend_config_provider_identifier: my_provider
-oidc_user_backend_config_provider_discovery_endpoint: https://idp.example.com/
-oidc_user_backend_config_provider_client_id: my-client-id
-oidc_user_backend_config_provider_client_secret: my-client-secret
-
-# All options to the occ command are avaible in the
-# `oidc_user_backend_config_provider_settings_` namespace
-oidc_user_backend_config_provider_settings_unique_id: true
-oidc_user_backend_config_provider_settings_send_id_token_hint: true
-oidc_user_backend_config_provider_settings_mapping_display_name: name
-oidc_user_backend_config_provider_settings_mapping_uid: preferred_username
-oidc_user_backend_config_provider_settings_mapping_email: email
-```

roles/oidc_user_backend/defaults/main/config.yml

@@ -1,40 +0,0 @@
----
-oidc_user_backend_config_provider_identifier: ~
-oidc_user_backend_config_provider_client_id: ~
-oidc_user_backend_config_provider_client_secret: ~
-oidc_user_backend_config_provider_discovery_endpoint: ~
-oidc_user_backend_config_provider_end_session_endpoint: ~
-oidc_user_backend_config_provider_scopes:
-  - openid
-  - email
-  - profile
-
-oidc_user_backend_config_provider_settings_unique_uid: true
-oidc_user_backend_config_provider_settings_check_bearer: true
-oidc_user_backend_config_provider_settings_send_id_token_hint: true
-oidc_user_backend_config_provider_settings_bearer_provisioning: false
-oidc_user_backend_config_provider_settings_extra_claims: []
-oidc_user_backend_config_provider_settings_provider_based_id: false
-oidc_user_backend_config_provider_settings_group_provisioning: false
-
-oidc_user_backend_config_provider_settings_mapping_display_name: name
-oidc_user_backend_config_provider_settings_mapping_email: email
-oidc_user_backend_config_provider_settings_mapping_quota: ~
-oidc_user_backend_config_provider_settings_mapping_uid: sub
-oidc_user_backend_config_provider_settings_mapping_groups: ~
-oidc_user_backend_config_provider_settings_mapping_address: ~
-oidc_user_backend_config_provider_settings_mapping_street_address: ~
-oidc_user_backend_config_provider_settings_mapping_postal_code: ~
-oidc_user_backend_config_provider_settings_mapping_locality: ~
-oidc_user_backend_config_provider_settings_mapping_region: ~
-oidc_user_backend_config_provider_settings_mapping_country: ~
-oidc_user_backend_config_provider_settings_mapping_website: ~
-oidc_user_backend_config_provider_settings_mapping_avatar: ~
-oidc_user_backend_config_provider_settings_mapping_twitter: ~
-oidc_user_backend_config_provider_settings_mapping_fediverse: ~
-oidc_user_backend_config_provider_settings_mapping_organisation: ~
-oidc_user_backend_config_provider_settings_mapping_role: ~
-oidc_user_backend_config_provider_settings_mapping_headline: ~
-oidc_user_backend_config_provider_settings_mapping_biography: ~
-oidc_user_backend_config_provider_settings_mapping_phone: ~
-oidc_user_backend_config_provider_settings_mapping_gender: ~

roles/oidc_user_backend/defaults/main/main.yml

@@ -1,5 +0,0 @@
----
-oidc_user_backend_deployment_method: host
-oidc_user_backend_deployment_become_user: ~
-oidc_user_backend_deployment_method_docker_container_name: nextcloud
-oidc_user_backend_deployment_method_podman_container_name: nextcloud

roles/oidc_user_backend/defaults/main/occ.yml

@@ -1,15 +0,0 @@
----
-oidc_user_backend_occ_command: "php occ"
-oidc_user_backend_occ_user_oidc_provider_identifier: >-2
-  {{ oidc_user_backend_config_provider_identifier }}
-oidc_user_backend_force_update: false
-
-oidc_user_backend_occ_user_oidc_provider_set_command: >-2
-  {{ oidc_user_backend_occ_command }} user_oidc:provider
-  {{ oidc_user_backend_occ_user_oidc_provider_options }}
-  {{ oidc_user_backend_occ_user_oidc_provider_identifier }}
-oidc_user_backend_occ_user_oidc_provider_list_command: >-2
-  {{ oidc_user_backend_occ_command }} user_oidc:provider --output=json
-oidc_user_backend_occ_user_oidc_provider_get_command: >-2
-  {{ oidc_user_backend_occ_command }} user_oidc:provider --output=json
-  {{ oidc_user_backend_occ_user_oidc_provider_identifier }}

roles/oidc_user_backend/meta/main.yml

@@ -1,12 +0,0 @@
----
-allow_duplicates: true
-dependencies: []
-galaxy_info:
-  role_name: oidc_user_backend
-  description: Configure a nextcloud oidc user backend using ansible
-  galaxy_tags:
-    - nextcloud
-    - owncloud
-    - oidc
-    - authentication
-    - docker

roles/oidc_user_backend/tasks/execute-occ.yml

@@ -1,41 +0,0 @@
----
-- name: Execute OCC command (host)
-  ansible.builtin.command:
-    cmd: "{{ oidc_user_backend_occ_command_to_exec }}"
-  become_user: "{{ oidc_user_backend_occ_user_to_become }}"
-  register: oidc_user_backend_occ_command_result_host
-  when: oidc_user_backend_deployment_method == 'host'
-
-- name: Execute OCC command (docker)
-  community.docker.docker_container_exec:
-    container: >-2
-      {{ oidc_user_backend_deployment_method_docker_container_name }}
-    command: "{{ oidc_user_backend_occ_command_to_exec }}"
-    user: "{{ oidc_user_backend_occ_user_to_become | default(omit, true) }}"
-  register: oidc_user_backend_occ_command_result_docker
-  when: oidc_user_backend_deployment_method == 'docker'
-
-- name: Execute OCC command (podman)
-  containers.podman.podman_container_exec:
-    name: >-2
-      {{ oidc_user_backend_deployment_method_podman_container_name }}
-    command: "{{ oidc_user_backend_occ_command_to_exec }}"
-    user: "{{ oidc_user_backend_occ_user_to_become | default(omit, true) }}"
-  register: oidc_user_backend_occ_command_result_podman
-  when: oidc_user_backend_deployment_method == 'podman'
-
-- name: Register result into variable
-  ansible.builtin.set_fact: {
-    "{{ oidc_user_backend_occ_command_result_var }}" : "{{
-      oidc_user_backend_occ_command_result.stdout | string | from_json
-    }}"
-  }
-  vars:
-    oidc_user_backend_occ_result_map:
-      host: "{{ oidc_user_backend_occ_command_result_host }}"
-      docker: "{{ oidc_user_backend_occ_command_result_docker }}"
-      podman: "{{ oidc_user_backend_occ_command_result_podman }}"
-    oidc_user_backend_occ_command_result: >-2
-      {{ oidc_user_backend_occ_result_map[oidc_user_backend_deployment_method]
-      | default(false, true) }}
-  when: oidc_user_backend_occ_command_result_var | default(false, true)

roles/oidc_user_backend/tasks/main.yml

@@ -1,52 +0,0 @@
----
-- name: Check if deployment method is supported
-  ansible.builtin.fail:
-    msg: >-2
-      Deployment method '{{ oidc_user_backend_deployment_method }}' is not supported!
-      Supported are: {{ oidc_user_backend_deployment_methods | join(', ') }}
-  when: oidc_user_backend_deployment_method not in oidc_user_backend_deployment_methods
-
-- name: Lookup become user info
-  ansible.builtin.user:
-    name: "{{ oidc_user_backend_deployment_become_user }}"
-    state: present
-  check_mode: true
-  register: oidc_user_backend_deployment_become_user_info
-  when: oidc_user_backend_deployment_become_user | default(false, true)
-
-- name: Retrieve configured providers
-  ansible.builtin.include_tasks:
-    file: execute-occ.yml
-  vars:
-    oidc_user_backend_occ_command_to_exec: >-
-      {{ oidc_user_backend_occ_user_oidc_provider_get_command }}
-    oidc_user_backend_occ_user_to_become: "{{ oidc_user_backend_deployment_become_user_info.uid }}"
-    oidc_user_backend_occ_command_result_var: "oidc_user_backend_occ_user_oidc_provider"
-
-- name: Check if provider information should be updated
-  set_fact:
-    oidc_user_backend_backend_force_update: true
-  loop: "{{ lookup('ansible.utils.to_paths', oidc_user_backend_occ_user_oidc_provider) | dict2items }}"
-  loop_control:
-    label: "{{ item.key }}"
-  vars:
-    target_config: >-2
-      {{ lookup('ansible.utils.to_paths', oidc_user_backend_occ_user_oidc_config_provider_dict) }}
-  when:
-    - item.key not in oidc_user_backend_occ_user_oidc_provider_ignored_settings
-    - (item.value != None) and (target_config[item.key] != None)
-    - >-2
-        (target_config[item.key] != None) | ternary(
-          (item.value != target_config[item.key]),
-          (item.value | string | length > 0)
-        )
-
-- name: Update configuration for provider '{{ oidc_user_backend_config_provider_identifier }}'
-  ansible.builtin.include_tasks:
-    file: execute-occ.yml
-  vars:
-    oidc_user_backend_occ_command_to_exec: >-
-      {{ oidc_user_backend_occ_user_oidc_provider_set_command }}
-    oidc_user_backend_occ_user_to_become: "{{ oidc_user_backend_deployment_become_user_info.uid }}"
-    oidc_user_backend_occ_command_result_var: ~
-  when: oidc_user_backend_backend_force_update | default(false, true)

roles/oidc_user_backend/vars/main/main.yml

@@ -1,9 +0,0 @@
----
-oidc_user_backend_deployment_methods:
-  - host
-  - docker
-  - podman
-
-oidc_user_backend_occ_user_oidc_provider_ignored_settings:
-  - 'id'
-  - 'settings.bearerProvisioning'

roles/oidc_user_backend/vars/main/provider-options-json.yml

@@ -1,43 +0,0 @@
----
-# JSON structure of the `occ` response with `--output=json`
-oidc_user_backend_occ_user_oidc_config_provider_dict:
-  identifier: "{{ oidc_user_backend_config_provider_identifier }}"
-  clientId: "{{ oidc_user_backend_config_provider_client_id }}"
-  clientSecret: "{{ oidc_user_backend_config_provider_client_secret }}"
-  discoveryEndpoint: "{{ oidc_user_backend_config_provider_discovery_endpoint }}"
-  endSessionEndpoint: "{{ oidc_user_backend_config_provider_end_session_endpoint }}"
-  scope: "{{ oidc_user_backend_config_provider_scopes | default([], true) | join(' ') }}"
-  settings:
-    uniqueUid: >-2
-      {{ oidc_user_backend_config_provider_settings_unique_uid | bool }}
-    providerBasedId: >-2
-      {{ oidc_user_backend_config_provider_settings_provider_based_id | bool }}
-    checkBearer: >-2
-      {{ oidc_user_backend_config_provider_settings_check_bearer | bool }}
-    sendIdTokenHint: >-2
-      {{ oidc_user_backend_config_provider_settings_send_id_token_hint | bool }}
-    groupProvisioning: >-2
-      {{ oidc_user_backend_config_provider_settings_group_provisioning | bool }}
-    extraClaims: >-2
-      {{ oidc_user_backend_config_provider_settings_extra_claims | default([]) | join(' ') }}
-    mappingDisplayName: "{{ oidc_user_backend_config_provider_settings_mapping_display_name }}"
-    mappingEmail: "{{ oidc_user_backend_config_provider_settings_mapping_email }}"
-    mappingQuota: "{{ oidc_user_backend_config_provider_settings_mapping_quota }}"
-    mappingUid: "{{ oidc_user_backend_config_provider_settings_mapping_uid }}"
-    mappingGroups: "{{ oidc_user_backend_config_provider_settings_mapping_groups }}"
-    mappingWebsite: "{{ oidc_user_backend_config_provider_settings_mapping_website }}"
-    mappingAvatar: "{{ oidc_user_backend_config_provider_settings_mapping_avatar }}"
-    mappingTwitter: "{{ oidc_user_backend_config_provider_settings_mapping_twitter }}"
-    mappingFediverse: "{{ oidc_user_backend_config_provider_settings_mapping_fediverse }}"
-    mappingOrganisation: "{{ oidc_user_backend_config_provider_settings_mapping_organisation }}"
-    mappingRole: "{{ oidc_user_backend_config_provider_settings_mapping_role }}"
-    mappingHeadline: "{{ oidc_user_backend_config_provider_settings_mapping_headline }}"
-    mappingBiography: "{{ oidc_user_backend_config_provider_settings_mapping_biography }}"
-    mappingPhonenumber: "{{ oidc_user_backend_config_provider_settings_mapping_phone }}"
-    mappingGender: "{{ oidc_user_backend_config_provider_settings_mapping_gender }}"
-    mappingAddress: "{{ oidc_user_backend_config_provider_settings_mapping_address }}"
-    mappingStreetaddress: "{{ oidc_user_backend_config_provider_settings_mapping_street_address }}"
-    mappingPostalcode: "{{ oidc_user_backend_config_provider_settings_mapping_postal_code }}"
-    mappingLocality: "{{ oidc_user_backend_config_provider_settings_mapping_locality }}"
-    mappingRegion: "{{ oidc_user_backend_config_provider_settings_mapping_region }}"
-    mappingCountry: "{{ oidc_user_backend_config_provider_settings_mapping_country }}"

roles/oidc_user_backend/vars/main/provider-options.yml

@@ -1,54 +0,0 @@
----
-# Structure how `occ user_oidc:provider [options] [<identifier>]` expects them
-oidc_user_backend_occ_user_oidc_provider_options_dict:
-  clientid: "{{ oidc_user_backend_config_provider_client_id }}"
-  clientsecret: "{{ oidc_user_backend_config_provider_client_secret }}"
-  discoveryuri: "{{ oidc_user_backend_config_provider_discovery_endpoint }}"
-  endsessionendpointuri: "{{ oidc_user_backend_config_provider_end_session_endpoint }}"
-  scope: "'{{ oidc_user_backend_config_provider_scopes | default([], true) | join(' ') }}'"
-  "unique-uid": >-2
-    {{ oidc_user_backend_config_provider_settings_unique_uid | bool | ternary(1, 0) }}
-  "check-bearer": >-2
-    {{ oidc_user_backend_config_provider_settings_check_bearer | bool | ternary(1, 0) }}
-  "send-id-token-hint": >-2
-    {{ oidc_user_backend_config_provider_settings_send_id_token_hint | bool | ternary(1, 0) }}
-  "group-provisioning": >-2
-    {{ oidc_user_backend_config_provider_settings_group_provisioning | bool | ternary(1, 0) }}
-  "extra-claims": >-2
-    {{ (oidc_user_backend_config_provider_settings_extra_claims | default([]) | length > 0)
-       | ternary(oidc_user_backend_config_provider_settings_extra_claims | join(' ') | quote, '') }}
-
-oidc_user_backend_occ_user_oidc_provider_mapping_options_dict:
-  "display-name": "{{ oidc_user_backend_config_provider_settings_mapping_display_name }}"
-  email: "{{ oidc_user_backend_config_provider_settings_mapping_email }}"
-  quota: "{{ oidc_user_backend_config_provider_settings_mapping_quota }}"
-  uid: "{{ oidc_user_backend_config_provider_settings_mapping_uid }}"
-  groups: "{{ oidc_user_backend_config_provider_settings_mapping_groups }}"
-  website: "{{ oidc_user_backend_config_provider_settings_mapping_website }}"
-  avatar: "{{ oidc_user_backend_config_provider_settings_mapping_avatar }}"
-  twitter: "{{ oidc_user_backend_config_provider_settings_mapping_twitter }}"
-  fediverse: "{{ oidc_user_backend_config_provider_settings_mapping_fediverse }}"
-  organisation: "{{ oidc_user_backend_config_provider_settings_mapping_organisation }}"
-  role: "{{ oidc_user_backend_config_provider_settings_mapping_role }}"
-  headline: "{{ oidc_user_backend_config_provider_settings_mapping_headline }}"
-  biography: "{{ oidc_user_backend_config_provider_settings_mapping_biography }}"
-  phone: "{{ oidc_user_backend_config_provider_settings_mapping_phone }}"
-  gender: "{{ oidc_user_backend_config_provider_settings_mapping_gender }}"
-  address: "{{ oidc_user_backend_config_provider_settings_mapping_address }}"
-  street_address: "{{ oidc_user_backend_config_provider_settings_mapping_street_address }}"
-  postal_code: "{{ oidc_user_backend_config_provider_settings_mapping_postal_code }}"
-  locality: "{{ oidc_user_backend_config_provider_settings_mapping_locality }}"
-  region: "{{ oidc_user_backend_config_provider_settings_mapping_region }}"
-  country: "{{ oidc_user_backend_config_provider_settings_mapping_country }}"
-
-oidc_user_backend_occ_user_oidc_provider_options: >-2
-  {% for tuple in oidc_user_backend_occ_user_oidc_provider_options_dict | dict2items %}
-  {% if tuple.value | default(false, true) %}
-  --{{ tuple.key }}={{ tuple.value }}
-  {% endif %}
-  {% endfor %}
-  {% for tuple in oidc_user_backend_occ_user_oidc_provider_mapping_options_dict | dict2items %}
-  {% if tuple.value | default(false, true) %}
-  --mapping-{{ tuple.key }}={{ tuple.value }}
-  {% endif %}
-  {% endfor %}

roles/server/README.md

@@ -12,10 +12,3 @@ so the host file permissions remain comprehensible.
 - `nextcloud_socket_path`: Setting this (to, for example, `{{ nextcloud_basepath }}/socket`),
   will make FPM listen on `{{ nextcloud_socket_path }}/nextcloud.sock` on the host, enabling
   you to use FPM to interface with nextcloud.
-
-### Redis over UNIX-Socket
-
-Set `REDIS_HOST` to a path in the container where the socket is mapped using
-`nextcloud_container_extra_environment`. Also set `REDIS_HOST_PORT` to 0
-explicitely, as `redis.config.php` will set it to `null` otherwise, resulting
-in an exception. Set your redis password in `REDIS_HOST_PASSWORD`.

roles/server/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 
-nextcloud_version: 30.0.2
+nextcloud_version: 23.0.3
 nextcloud_user: nextcloud
 nextcloud_basepath: /opt/nextcloud
 nextcloud_config_path: "{{ nextcloud_basepath }}/config"
@@ -20,20 +20,9 @@ nextcloud_database_pass: ~
 nextcloud_database_host: localhost
 
 nextcloud_container_name: nextcloud
-nextcloud_container_image_server: docker.io
+nextcloud_container_image: docker.io/library/nextcloud
-nextcloud_container_image_namespace: library
-nextcloud_container_image_name: nextcloud
-nextcloud_container_image: >-2
-  {{
-    [
-      nextcloud_container_image_server,
-      nextcloud_container_image_namespace,
-      nextcloud_container_image_name,
-    ] | join('/')
-  }}
 nextcloud_container_image_variant: "-fpm-alpine"
-nextcloud_container_image_ref: >-2
+nextcloud_container_image_ref: "{{ nextcloud_container_name }}:{{ nextcloud_version }}{{ nextcloud_container_image_variant }}"
-  {{ nextcloud_container_image }}:{{ nextcloud_version }}{{ nextcloud_container_image_variant }}
 nextcloud_container_image_force_source: false
 nextcloud_container_restart_policy: "unless-stopped"
 
@@ -52,16 +41,17 @@ nextcloud_container_extra_labels: {}
 nextcloud_container_extra_environment: {}
 
 nextcloud_container_networks: ~
+nextcloud_container_purge_other_networks: true
 
 nextcloud_paths:
   - path: "{{ nextcloud_config_path }}"
     mode: "0755"
     owner: "{{ nextcloud_user_info.uid|default(nextcloud_user) }}"
-    group: root
+    group: "root"
   - path: "{{ nextcloud_data_path }}"
     mode: "0755"
     owner: "{{ nextcloud_user_info.uid|default(nextcloud_user) }}"
-    group: "{{ nextcloud_user_info.group | default(nextcloud_user) }}"
+    group: "{{ nextcloud_user_info.uid|default(nextcloud_user) }}"
   - path: "{{ nextcloud_fpm_config_path }}"
     mode: "0750"
     owner: root

roles/server/meta/main.yml

@@ -1,10 +0,0 @@
----
-allow_duplicates: true
-dependencies: []
-galaxy_info:
-  role_name: server
-  description: Deploy nextcloud server, the self-hosted nextcloud
-  galaxy_tags:
-    - nextcloud
-    - owncloud
-    - docker

roles/server/tasks/configure-single-setting.yml

@@ -9,9 +9,6 @@
         user: "{{ nextcloud_user_info.uid }}"
         tty: yes
       register: nextcloud_current_config_entry
-      until: nextcloud_current_config_entry is success
-      retries: 30
-      delay: 10
       check_mode: false
       changed_when: false
 
@@ -28,9 +25,9 @@
     value_type: >-
       {% if value is boolean %}
       boolean
-      {% elif value is integer %}
+      {% elsif value is integer %}
       integer
-      {% elif value is float %}
+      {% elsif value is float %}
       float
       {% else %}
       string

roles/server/tasks/main.yml

@@ -1,14 +1,14 @@
 ---
 
 - name: Create nextcloud user
-  ansible.builtin.user:
+  user:
     name: "{{ nextcloud_user }}"
     state: present
     system: yes
   register: nextcloud_user_info
 
 - name: Map nextcloud socket path if defined
-  ansible.builtin.set_fact:
+  set_fact:
     nextcloud_paths: "{{ nextcloud_paths + [ socket_dir ] }}"
     nextcloud_container_base_volumes: "{{ nextcloud_container_base_volumes + [ socket_map ] }}"
   vars:
@@ -21,7 +21,7 @@
   when: nextcloud_socket_path is defined and nextcloud_socket_path is string
 
 - name: Ensure nextcloud directories exist and have correct permissions
-  ansible.builtin.file:
+  file:
     path: "{{ item.path }}"
     state: directory
     mode: "{{ item.mode }}"
@@ -29,15 +29,15 @@
     group: "{{ item.group }}"
   loop: "{{ nextcloud_paths }}"
 
-- name: Ensure docker container image '{{ nextcloud_container_image_ref }}' for nextcloud is pulled
+- name: Ensure docker container for nextcloud is pulled
-  community.docker.docker_image:
+  docker_image:
     name: "{{ nextcloud_container_image_ref }}"
     state: present
     source: pull
     force_source: "{{ nextcloud_container_image_force_source }}"
 
 - name: Template OpCache configuration
-  ansible.builtin.template:
+  template:
     src: nextcloud-fpm-opcache.ini.j2
     dest: "{{ nextcloud_fpm_config_path }}/opcache.ini"
     mode: "0640"
@@ -47,7 +47,7 @@
     - reload-nextcloud
 
 - name: Template PHP FPM configuration
-  ansible.builtin.template:
+  template:
     src: nextcloud-fpm.ini.j2
     dest: "{{ nextcloud_fpm_config_path }}/fpm.ini"
     mode: "0640"
@@ -57,7 +57,7 @@
     - reload-nextcloud
 
 - name: Template PHP FPM docker-specific configuration
-  ansible.builtin.template:
+  template:
     src: nextcloud-fpm-docker.ini.j2
     dest: "{{ nextcloud_fpm_config_path }}/fpm-docker.ini"
     mode: "0640"
@@ -67,7 +67,7 @@
     - reload-nextcloud
 
 - name: Template modified /etc/passwd for nextcloud container
-  ansible.builtin.template:
+  template:
     src: nextcloud-passwd.j2
     dest: "{{ nextcloud_basepath }}/nextcloud-passwd"
     mode: "0640"
@@ -77,7 +77,7 @@
     - reload-nextcloud
 
 - name: Template modified /etc/passwd for nextcloud container
-  ansible.builtin.template:
+  template:
     src: nextcloud-group.j2
     dest: "{{ nextcloud_basepath }}/nextcloud-group"
     mode: "0640"
@@ -87,7 +87,7 @@
     - reload-nextcloud
 
 - name: Template systemd service for nextcloud's cron job
-  ansible.builtin.template:
+  template:
     src: systemd-nextcloud-cron.service.j2
     dest: /etc/systemd/system/nextcloud-cron.service
     mode: "0640"
@@ -98,7 +98,7 @@
     - reload-systemd
 
 - name: Template timer for nextcloud's cron job
-  ansible.builtin.template:
+  template:
     src: systemd-nextcloud-cron.timer.j2
     dest: /etc/systemd/system/nextcloud-cron.timer
     mode: "0640"
@@ -109,34 +109,34 @@
     - reload-systemd
 
 - name: Flush handlers now to ensure systemd can know about the timer before it's enabled
-  ansible.builtin.meta: flush_handlers
+  meta: flush_handlers
 
 - name: Ensure docker container for nextcloud is running
-  community.docker.docker_container:
+  docker_container:
     name: "{{ nextcloud_container_name }}"
     image: "{{ nextcloud_container_image_ref }}"
     volumes: "{{ nextcloud_container_volumes }}"
     labels: "{{ nextcloud_container_labels }}"
     env: "{{ nextcloud_container_env }}"
-    etc_hosts: "{{ nextcloud_container_etc_hosts | default(omit, true) }}"
     networks: "{{ nextcloud_container_networks | default(omit, true) }}"
+    purge_networks: "{{ nextcloud_container_purge_other_networks }}"
     restart_policy: "{{ nextcloud_container_restart_policy }}"
     state: started
 
 - name: Enable systemd timer for nextcloud cron
-  ansible.builtin.systemd:
+  systemd:
     name: "nextcloud-cron.timer"
     enabled: yes
   when: nextcloud_background_job_mode == 'cron'
 
 - name: Ensure systemd timer for nextcloud cron is started
-  ansible.builtin.systemd:
+  systemd:
     name: "nextcloud-cron.timer"
     state: started
   when: nextcloud_background_job_mode == 'cron'
 
 - name: Configure nextcloud
-  ansible.builtin.include_tasks:
+  include_tasks:
     file: configure-single-setting.yml
   vars:
     key: "{{ item.key | replace('[', '.') | replace(']', '.') }}"

roles/server/templates/nextcloud-fpm.ini.j2

@@ -4,7 +4,7 @@ user = www-data
 group = www-data
 
 {% if nextcloud_socket_path is defined and nextcloud_socket_path is string %}
-listen = {{ nextcloud_container_php_socket_path }}/{{ nextcloud_container_name }}.sock
+listen = {{ nextcloud_container_php_socket_path }}/nextcloud.sock
 listen.owner = www-data
 listen.group = www-data
 listen.mode = 0666