update(server): bump version to 31.0.6

galaxy.yml

@@ -1,12 +1,12 @@
 namespace: finallycoffee
 name: nextcloud
-version: 0.7.1
+version: "0.8.0"
 readme: README.md
 authors:
 - transcaffeine <transcaffeine@finally.coffee>
 description: Installing and configuring nextcloud (and related apps/services) using docker
 dependencies:
-  "community.docker": "^3.0.0"
+  "community.docker": "^4.0.0"
 license_file: LICENSE.md
 build_ignore:
 - '*.tar.gz'
@@ -14,5 +14,5 @@ repository: https://git.finally.coffee/finallycoffee/nextcloud
 issues: https://codeberg.org/finallycoffee/ansible-collection-nextcloud/issues
 tags:
   - nextcloud
-  - nextcloud-apps
+  - nextcloud_apps
   - docker

playbooks/onlyoffice_documentserver.yml

@@ -0,0 +1,6 @@
+---
+- name: Deploy onlyoffice documentserver
+  hosts: "{{ onlyoffice_documentserver_hosts | default('onlyoffice_documentserver') }}"
+  become: "{{ onlyoffice_documentserver_become | default(false, true) }}"
+  roles:
+    - role: finallycoffee.nextcloud.onlyoffice_documentserver

roles/ldap_user_backend/vars/main.yml

@@ -12,9 +12,12 @@ nc_ldap_config_keys:
   ldapBackupHost: "{{ nc_ldap_config_backup_host }}"
   ldapBackupPort: "{{ nc_ldap_config_backup_port }}"
   ldapOverrideMainServer: "{{ nc_ldap_config_override_main_server }}"
-  ldapBase: "{{ nc_ldap_config_base_dn }}"
+  ldapBase:
-  ldapBaseUsers: "{{ nc_ldap_config_base_dn_users }}"
+    - "{{ nc_ldap_config_base_dn }}"
-  ldapBaseGroups: "{{ nc_ldap_config_base_dn_groups }}"
+  ldapBaseUsers:
+    - "{{ nc_ldap_config_base_dn_users }}"
+  ldapBaseGroups:
+    - "{{ nc_ldap_config_base_dn_groups }}"
   ldapAgentName: "{{ nc_ldap_config_agent_name }}"
   ldapAgentPassword: "{{ nc_ldap_config_agent_password }}"
   ldapTLS: "{{ nc_ldap_config_tls }}"
@@ -30,8 +33,10 @@ nc_ldap_config_keys:
   ldapAttributesForUserSearch: "{{ nc_ldap_config_attributes_for_user_search }}"
   ldapGroupFilter: "{{ nc_ldap_config_group_filter }}"
   ldapGroupFilterMode: "{{ nc_ldap_config_group_filter_mode }}"
-  ldapGroupFilterObjectclass: "{{ nc_ldap_config_group_filter_objectclass }}"
+  ldapGroupFilterObjectclass:
-  ldapGroupFilterGroups: "{{ nc_ldap_config_group_filter_groups }}"
+    - "{{ nc_ldap_config_group_filter_objectclass }}"
+  ldapGroupFilterGroups:
+    - "{{ nc_ldap_config_group_filter_groups }}"
   ldapGroupMemberAssocAttr: "{{ nc_ldap_config_group_member_assoc_attr }}"
   ldapGroupDisplayName: "{{ nc_ldap_config_group_displayname }}"
   ldapAttributesForGroupSearch: "{{ nc_ldap_config_attributes_for_group_search }}"

roles/nginx_fpm_proxy/defaults/main.yml

@@ -1,6 +1,5 @@
 ---
-
+nextcloud_nginx_version: "1.28.0"
-nextcloud_nginx_version: "1.25.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

@@ -29,9 +29,9 @@
     env: "{{ nextcloud_nginx_container_env }}"
     name: "{{ nextcloud_nginx_container_name }}"
     image: "{{ nextcloud_nginx_container_image_ref }}"
-    ports: "{{ nextcloud_nginx_container_ports }}"
+    ports: "{{ nextcloud_nginx_container_ports  | default(omit, true) }}"
     volumes: "{{ nextcloud_nginx_container_volumes }}"
-    labels: "{{ nextcloud_nginx_container_labels }}"
+    labels: "{{ nextcloud_nginx_container_labels | default(omit, true) }}"
-    networks: "{{ nextcloud_nginx_container_networks | default(omit) }}"
+    networks: "{{ nextcloud_nginx_container_networks | default(omit, true) }}"
     restart_policy: "{{ nextcloud_nginx_container_restart_policy }}"
     state: started

roles/onlyoffice_documentserver/README.md

@@ -0,0 +1,4 @@
+# `finallycoffee.nextcloud.onlyoffice_documentserver` ansible role
+
+Ansible role to deploy [ONLYOFFICE](https://www.onlyoffice.com)'s
+document editing server using docker.

roles/onlyoffice_documentserver/defaults/main/container.yml

@@ -0,0 +1,44 @@
+---
+onlyoffice_documentserver_container_name: "onlyoffice-documentserver"
+onlyoffice_documentserver_container_image: >-2
+  {{
+    [
+      onlyoffice_documentserver_container_image_repository,
+      onlyoffice_documentserver_container_image_tag
+        | default(onlyoffice_documentserver_version, true)
+    ] | join(':')
+  }}
+onlyoffice_documentserver_container_image_registry: docker.io
+onlyoffice_documentserver_container_image_namespace: "onlyoffice"
+onlyoffice_documentserver_container_image_name: "documentserver"
+onlyoffice_documentserver_container_image_repository: >-2
+  {{ onlyoffice_documentserver_container_image_registry
+  + (('/' + onlyoffice_documentserver_container_image_namespace)
+      if onlyoffice_documentserver_container_image_namespace else '')
+  + '/' + onlyoffice_documentserver_container_image_name }}
+onlyoffice_documentserver_container_image_tag: ~
+onlyoffice_documentserver_container_image_source: pull
+onlyoffice_documentserver_container_image_force_source: >-2
+  {{ onlyoffice_documentserver_container_image_tag | default(false, true) }}
+onlyoffice_documentserver_container_env: {}
+onlyoffice_documentserver_container_ports: ~
+onlyoffice_documentserver_container_labels: ~
+onlyoffice_documentserver_container_ulimits: ~
+onlyoffice_documentserver_container_networks: ~
+onlyoffice_documentserver_container_dns_servers: ~
+onlyoffice_documentserver_container_etc_hosts: ~
+onlyoffice_documentserver_container_memory: ~
+onlyoffice_documentserver_container_memory_reservation: ~
+onlyoffice_documentserver_container_memory_swap: ~
+
+onlyoffice_documentserver_container_state: >-2
+  {{ (onlyoffice_documentserver_state == 'present')
+    | ternary('started', 'absent') }}
+onlyoffice_documentserver_container_restart_policy: "on-failure"
+
+onlyoffice_documentserver_default_volumes:
+  - "/var/log/onlyoffice:/var/log/onlyoffice:rw"
+onlyoffice_documentserver_volumes: ~
+onlyoffice_documentserver_all_volumes: >-2
+  {{ onlyoffice_documentserver_default_volumes | default([], true)
+     + onlyoffice_documentserver_volumes | default([], true) }}

roles/onlyoffice_documentserver/defaults/main/main.yml

@@ -0,0 +1,6 @@
+---
+onlyoffice_documentserver_user: "onlyoffice"
+onlyoffice_documentserver_version: "8.3.3"
+
+onlyoffice_documentserver_state: present
+onlyoffice_documentserver_deployment_method: docker

roles/onlyoffice_documentserver/tasks/deploy-docker.yml

@@ -0,0 +1,25 @@
+---
+- name: Ensure container image '{{ onlyoffice_documentserver_container_image }}' is {{ onlyoffice_documentserver_state }}
+  community.docker.docker_image:
+    name: "{{ onlyoffice_documentserver_container_image }}"
+    state: "{{ onlyoffice_documentserver_state }}"
+    source: "{{ onlyoffice_documentserver_container_image_source }}"
+    force_source: "{{ onlyoffice_documentserver_container_image_force_source }}"
+
+- name: Ensure container '{{ onlyoffice_documentserver_container_name }}' is {{ onlyoffice_documentserver_container_state }}
+  community.docker.docker_container:
+    name: "{{ onlyoffice_documentserver_container_name }}"
+    image: "{{ onlyoffice_documentserver_container_image }}"
+    env: "{{ onlyoffice_documentserver_container_env | default(omit, true) }}"
+    ports: "{{ onlyoffice_documentserver_container_ports | default(omit, true) }}"
+    labels: "{{ onlyoffice_documentserver_container_labels | default(omit, true) }}"
+    volumes: "{{ onlyoffice_documentserver_all_volumes }}"
+    ulimits: "{{ onlyoffice_documentserver_container_ulimits | default(omit, true) }}"
+    networks: "{{ onlyoffice_documentserver_container_networks | default(omit, true) }}"
+    dns_servers: "{{ onlyoffice_documentserver_container_dns_servers | default(omit, true) }}"
+    etc_hosts: "{{ onlyoffice_documentserver_container_etc_hosts | default(omit, true) }}"
+    memory: "{{ onlyoffice_documentserver_container_memory | default(omit, true) }}"
+    memory_reservation: "{{ onlyoffice_documentserver_container_memory_reservation | default(omit, true) }}"
+    memory_swap: "{{ onlyoffice_documentserver_container_memory_swap | default(omit, true) }}"
+    restart_policy: "{{ onlyoffice_documentserver_container_restart_policy }}"
+    state: "{{ onlyoffice_documentserver_container_state }}"

roles/onlyoffice_documentserver/tasks/main.yml

@@ -0,0 +1,18 @@
+---
+- name: Ensure 'onlyoffice_documentserver_state' is valid
+  ansible.builtin.fail:
+    msg: >-2
+      Unsupported state '{{ onlyoffice_documentserver_state }}'.
+      Supported states are {{ onlyoffice_documentserver_states | join(', ') }}.
+  when: onlyoffice_documentserver_state not in onlyoffice_documentserver_states
+
+- name: Ensure 'onlyoffice_documentserver_deployment_method' is valid
+  ansible.builtin.fail:
+    msg: >-2
+      Unsupported deployment method '{{ onlyoffice_documentserver_deployment_method }}'.
+      Supported deployment methods are {{ onlyoffice_documentserver_deployment_methods | join(', ') }}.
+  when: onlyoffice_documentserver_deployment_method not in onlyoffice_documentserver_deployment_methods
+
+- name: Deploy using {{ onlyoffice_documentserver_deployment_method }}
+  ansible.builtin.include_tasks:
+    file: "deploy-{{ onlyoffice_documentserver_deployment_method }}.yml"

roles/onlyoffice_documentserver/vars/main.yml

@@ -0,0 +1,6 @@
+---
+onlyoffice_documentserver_states:
+  - present
+  - absent
+onlyoffice_documentserver_deployment_methods:
+  - docker

roles/server/defaults/main.yml

@@ -1,6 +1,5 @@
 ---
-
+nextcloud_version: "31.0.6"
-nextcloud_version: 30.0.1
 nextcloud_user: nextcloud
 nextcloud_basepath: /opt/nextcloud
 nextcloud_config_path: "{{ nextcloud_basepath }}/config"
@@ -52,7 +51,6 @@ nextcloud_container_extra_labels: {}
 nextcloud_container_extra_environment: {}
 
 nextcloud_container_networks: ~
-nextcloud_container_purge_other_networks: true
 
 nextcloud_paths:
   - path: "{{ nextcloud_config_path }}"

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

@@ -28,9 +28,9 @@
     value_type: >-
       {% if value is boolean %}
       boolean
-      {% elsif value is integer %}
+      {% elif value is integer %}
       integer
-      {% elsif value is float %}
+      {% elif value is float %}
       float
       {% else %}
       string

roles/server/tasks/main.yml

@@ -118,8 +118,8 @@
     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