refactor(server): migrate to fully qualified module names

roles/apps/handlers/main.yml

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

roles/apps/tasks/main.yml

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

roles/ldap_user_backend/tasks/load_config_http.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Set default api parameters for HTTP
-  meta: noop
+  ansible.builtin.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
-  uri:
+  ansible.builtin.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 }}
-  uri:
+  ansible.builtin.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
-  set_fact:
+  ansible.builtin.set_fact:
     nc_ldap_existing_config: "{{ nc_ldap_existing_config_api.stdout | from_json }}"
   changed_when: false
 
 - name: Create changeset
-  set_fact:
+  ansible.builtin.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)
-  uri:
+  ansible.builtin.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
-  docker_container_exec:
+  community.docker.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 }}
-  docker_container_exec:
+  community.docker.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
-  set_fact:
+  ansible.builtin.set_fact:
     nc_ldap_existing_config: "{{ nc_ldap_existing_config_occ.stdout | from_json }}"
   changed_when: false
 
 - name: Create changeset
-  set_fact:
+  ansible.builtin.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
-  docker_container_exec:
+  community.docker.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
-  docker_container_exec:
+  community.docker.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
-  include_tasks: load_config_http.yml
+  ansible.builtin.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
-  include_tasks: load_config_occ.yml
+  ansible.builtin.include_tasks: load_config_occ.yml
   when: nc_ldap_api_method == 'occ'
 

roles/nginx_fpm_proxy/tasks/main.yml

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

roles/server/tasks/main.yml

@@ -1,14 +1,14 @@
 ---
 
 - name: Create nextcloud user
-  user:
+  ansible.builtin.user:
     name: "{{ nextcloud_user }}"
     state: present
     system: yes
   register: nextcloud_user_info
 
 - name: Map nextcloud socket path if defined
-  set_fact:
+  ansible.builtin.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
-  file:
+  ansible.builtin.file:
     path: "{{ item.path }}"
     state: directory
     mode: "{{ item.mode }}"
@@ -30,14 +30,14 @@
   loop: "{{ nextcloud_paths }}"
 
 - name: Ensure docker container for nextcloud is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ nextcloud_container_image_ref }}"
     state: present
     source: pull
     force_source: "{{ nextcloud_container_image_force_source }}"
 
 - name: Template OpCache configuration
-  template:
+  ansible.builtin.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
-  template:
+  ansible.builtin.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
-  template:
+  ansible.builtin.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
-  template:
+  ansible.builtin.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
-  template:
+  ansible.builtin.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
-  template:
+  ansible.builtin.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
-  template:
+  ansible.builtin.template:
     src: systemd-nextcloud-cron.timer.j2
     dest: /etc/systemd/system/nextcloud-cron.timer
     mode: "0640"
@@ -109,10 +109,10 @@
     - reload-systemd
 
 - name: Flush handlers now to ensure systemd can know about the timer before it's enabled
-  meta: flush_handlers
+  ansible.builtin.meta: flush_handlers
 
 - name: Ensure docker container for nextcloud is running
-  docker_container:
+  community.docker.docker_container:
     name: "{{ nextcloud_container_name }}"
     image: "{{ nextcloud_container_image_ref }}"
     volumes: "{{ nextcloud_container_volumes }}"
@@ -124,19 +124,19 @@
     state: started
 
 - name: Enable systemd timer for nextcloud cron
-  systemd:
+  ansible.builtin.systemd:
     name: "nextcloud-cron.timer"
     enabled: yes
   when: nextcloud_background_job_mode == 'cron'
 
 - name: Ensure systemd timer for nextcloud cron is started
-  systemd:
+  ansible.builtin.systemd:
     name: "nextcloud-cron.timer"
     state: started
   when: nextcloud_background_job_mode == 'cron'
 
 - name: Configure nextcloud
-  include_tasks:
+  ansible.builtin.include_tasks:
     file: configure-single-setting.yml
   vars:
     key: "{{ item.key | replace('[', '.') | replace(']', '.') }}"