feat(oidc_user_backend): add ansible role

galaxy.yml

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

playbooks/onlyoffice_documentserver.yml

@@ -1,6 +0,0 @@
----
-- 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/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/ldap_user_backend/meta/main.yml

@@ -1,12 +1,4 @@
 ---
-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
+
+collections:
+  - community.docker

roles/ldap_user_backend/vars/main.yml

@@ -12,12 +12,9 @@ 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 }}"
-  ldapBaseUsers:
-    - "{{ nc_ldap_config_base_dn_users }}"
-  ldapBaseGroups:
-    - "{{ nc_ldap_config_base_dn_groups }}"
+  ldapBase: "{{ nc_ldap_config_base_dn }}"
+  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 }}"
@@ -33,10 +30,8 @@ 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 }}"
-  ldapGroupFilterGroups:
-    - "{{ nc_ldap_config_group_filter_groups }}"
+  ldapGroupFilterObjectclass: "{{ 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,5 +1,6 @@
 ---
-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/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/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  | default(omit, true) }}"
+    ports: "{{ nextcloud_nginx_container_ports }}"
     volumes: "{{ nextcloud_nginx_container_volumes }}"
-    labels: "{{ nextcloud_nginx_container_labels | default(omit, true) }}"
-    networks: "{{ nextcloud_nginx_container_networks | default(omit, true) }}"
+    labels: "{{ nextcloud_nginx_container_labels }}"
+    networks: "{{ nextcloud_nginx_container_networks | default(omit) }}"
     restart_policy: "{{ nextcloud_nginx_container_restart_policy }}"
     state: started

roles/oidc_user_backend/README.md

@@ -4,6 +4,9 @@ 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.
 
+> [!WARNING]
+> This role is not production ready or finished
+
 ## Configuration
 
 Set `oidc_user_backend_provider_identifier` to a unique identifier.

roles/oidc_user_backend/defaults/main/config.yml

@@ -9,7 +9,7 @@ oidc_user_backend_config_provider_scopes:
   - email
   - profile
 
-oidc_user_backend_config_provider_settings_unique_uid: true
+oidc_user_backend_config_provider_settings_unique_id: 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
@@ -38,3 +38,5 @@ 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/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

@@ -38,4 +38,3 @@
     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

@@ -45,8 +45,8 @@
   ansible.builtin.include_tasks:
     file: execute-occ.yml
   vars:
-    oidc_user_backend_occ_command_to_exec: >-
+    occ_command: >-
       {{ 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: ~
+    occ_become_user: "{{ oidc_user_backend_deployment_become_user_info.uid }}"
+    occ_command_result_var: "oidc_user_backend_occ_user_oidc_provider_update_info"
   when: oidc_user_backend_backend_force_update | default(false, true)

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

@@ -9,7 +9,7 @@ oidc_user_backend_occ_user_oidc_config_provider_dict:
   scope: "{{ oidc_user_backend_config_provider_scopes | default([], true) | join(' ') }}"
   settings:
     uniqueUid: >-2
-      {{ oidc_user_backend_config_provider_settings_unique_uid | bool }}
+      {{ oidc_user_backend_config_provider_settings_unique_id | bool }}
     providerBasedId: >-2
       {{ oidc_user_backend_config_provider_settings_provider_based_id | bool }}
     checkBearer: >-2

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

@@ -7,7 +7,7 @@ oidc_user_backend_occ_user_oidc_provider_options_dict:
   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) }}
+    {{ oidc_user_backend_config_provider_settings_unique_id | bool | ternary(1, 0) }}
   "check-bearer": >-2
     {{ oidc_user_backend_config_provider_settings_check_bearer | bool | ternary(1, 0) }}
   "send-id-token-hint": >-2

roles/onlyoffice_documentserver/README.md

@@ -1,4 +0,0 @@
-# `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

@@ -1,44 +0,0 @@
----
-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

@@ -1,6 +0,0 @@
----
-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

@@ -1,25 +0,0 @@
----
-- 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

@@ -1,18 +0,0 @@
----
-- 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

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

roles/server/defaults/main.yml

@@ -1,5 +1,6 @@
 ---
-nextcloud_version: "31.0.6"
+
+nextcloud_version: 30.0.0
 nextcloud_user: nextcloud
 nextcloud_basepath: /opt/nextcloud
 nextcloud_config_path: "{{ nextcloud_basepath }}/config"
@@ -19,20 +20,9 @@ nextcloud_database_pass: ~
 nextcloud_database_host: localhost
 
 nextcloud_container_name: nextcloud
-nextcloud_container_image_server: docker.io
-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: docker.io/library/nextcloud
 nextcloud_container_image_variant: "-fpm-alpine"
-nextcloud_container_image_ref: >-2
-  {{ nextcloud_container_image }}:{{ nextcloud_version }}{{ nextcloud_container_image_variant }}
+nextcloud_container_image_ref: "{{ nextcloud_container_name }}:{{ nextcloud_version }}{{ nextcloud_container_image_variant }}"
 nextcloud_container_image_force_source: false
 nextcloud_container_restart_policy: "unless-stopped"
 
@@ -51,6 +41,7 @@ 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/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

@@ -29,7 +29,7 @@
     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:
     name: "{{ nextcloud_container_image_ref }}"
     state: present
@@ -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