meta: update collection version to 0.2.0, update dependencies

galaxy.yml

@@ -1,13 +1,14 @@
 namespace: finallycoffee
 name: services
-version: "0.1.14"
+version: "0.2.0"
 readme: README.md
 authors:
 - transcaffeine <transcaffeine@finally.coffee>
 description: Various ansible roles useful for automating infrastructure
 dependencies:
-  "community.crypto": "^2.22.0"
+  "community.general": "^11.0.0"
-  "community.docker": "^4.0.0"
+  "community.crypto": "^3.0.3"
+  "community.docker": "^4.7.0"
   "containers.podman": "^1.16.0"
 license_file: LICENSE.md
 build_ignore:
@@ -22,3 +23,4 @@ tags:
   - vaultwarden
   - snipeit
   - docker
+  - phpldapadmin

playbooks/phpldapadmin.yml

@@ -0,0 +1,7 @@
+---
+- name: Configure and run phpldapadmin
+  hosts: "{{ phpldapadmin_hosts | default('phpldapadmin', true) }}"
+  become: "{{ phpldapadmin_become | default(false) }}"
+  gather_facts: "{{ phpldapadmin_gather_facts | default(false) }}"
+  roles:
+    - role: finallycoffee.services.phpldapadmin

roles/authelia/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-authelia_version: "4.39.1"
+authelia_version: "4.39.6"
 authelia_user: authelia
 authelia_base_dir: /opt/authelia
 authelia_domain: authelia.example.org
@@ -15,7 +15,7 @@ authelia_notification_storage_file: "{{ authelia_data_dir }}/notifications.txt"
 authelia_user_storage_file: "{{ authelia_data_dir }}/user_database.yml"
 
 authelia_container_name: authelia
-authelia_container_image_server: docker.io
+authelia_container_image_server: ghcr.io
 authelia_container_image_namespace: authelia
 authelia_container_image_name: authelia
 authelia_container_image: >-2
@@ -92,7 +92,11 @@ authelia_config_webauthn_disable: true
 authelia_config_webauthn_timeout: 60s
 authelia_config_webauthn_display_name: "Authelia ({{ authelia_domain }})"
 authelia_config_webauthn_attestation_conveyance_preference: indirect
-authelia_config_webauthn_user_verification: preferred
+authelia_config_webauthn_user_verification: "preferred"
+authelia_config_webauthn_selection_criteria_user_verification: >-2
+  {{ authelia_config_webauthn_user_verification }}
+authelia_config_webauthn_selection_criteria_discoverability: "preferred"
+authelia_config_webauthn_selection_criteria_attachment: ""
 authelia_config_duo_api_hostname: ~
 authelia_config_duo_api_integration_key: ~
 authelia_config_duo_api_secret_key: ~
@@ -107,6 +111,8 @@ authelia_config_authentication_backend_password_reset_disable: false
 authelia_config_authentication_backend_password_reset_custom_url: ~
 authelia_config_authentication_backend_ldap_implementation: custom
 authelia_config_authentication_backend_ldap_url: ldap://127.0.0.1:389
+authelia_config_authentication_backend_ldap_address: >-2
+  {{ authelia_config_authentication_backend_ldap_url }}
 authelia_config_authentication_backend_ldap_timeout: 5s
 authelia_config_authentication_backend_ldap_start_tls: false
 authelia_config_authentication_backend_ldap_tls_skip_verify: false
@@ -157,6 +163,19 @@ authelia_config_session_inactivity: 5m
 authelia_config_session_remember_me_duration: 1M
 authelia_config_session_remember_me: >-2
   {{ authelia_config_session_remember_me_duration }}
+authelia_config_session_cookies:
+  - "{{ authelia_config_session_cookies_default }}"
+authelia_config_session_cookies_default_domain: >-2
+  {{ authelia_config_session_domain }}
+authelia_config_session_cookies_default_authelia_url: >-2
+  https://{{ authelia_config_session_cookies_default_domain }}
+authelia_config_session_cookies_default_default_redirection_url: >-2
+  {{ authelia_config_default_redirection_url }}
+authelia_config_session_cookies_default:
+  domain: "{{ authelia_config_session_cookies_default_domain }}"
+  authelia_url: "{{ authelia_config_session_cookies_default_authelia_url }}"
+  default_redirection_url: >-2
+    {{ authelia_config_session_cookies_default_default_redirection_url }}
 authelia_config_session_redis_host: "{{ authelia_redis_host }}"
 authelia_config_session_redis_port: "{{ authelia_redis_port }}"
 authelia_config_session_redis_username: "{{ authelia_redis_user }}"
@@ -193,7 +212,10 @@ authelia_config_notifier_smtp_disable_require_tls: false
 authelia_config_notifier_smtp_disable_html_emails: false
 authelia_config_notifier_smtp_tls_skip_verify: false
 authelia_config_notifier_smtp_tls_minimum_version: "{{ authelia_tls_minimum_version }}"
-#authelia_config_identity_provider_
+authelia_config_identity_validation_reset_password_jwt_secret: >-2
+  {{ authelia_config_jwt_secret }}
+authelia_config_identity_validation_reset_password_jwt_lifespan: "5 minutes"
+authelia_config_identity_validation_reset_password_jwt_algorithm: "HS256"
 
 authelia_database_type: ~
 authelia_database_host: ~

roles/authelia/vars/main.yml

@@ -25,7 +25,6 @@ authelia_container_base_labels:
 authelia_config: "{{ authelia_base_config | combine(authelia_extra_config, recursive=True) }}"
 authelia_top_level_config:
   theme: "{{ authelia_config_theme }}"
-  jwt_secret: "{{ authelia_config_jwt_secret }}"
   log: "{{ authelia_config_log }}"
   telemetry: "{{ authelia_config_telemetry }}"
   totp: "{{ authelia_config_totp }}"
@@ -39,12 +38,11 @@ authelia_top_level_config:
   regulation: "{{ authelia_config_regulation }}"
   storage: "{{ authelia_config_storage }}"
   notifier: "{{ authelia_config_notifier }}"
+  identity_validation: "{{ authelia_config_identity_validation }}"
 
 authelia_base_config: >-2
   {{
     authelia_top_level_config
-    | combine({"default_redirection_url": authelia_config_default_redirection_url}
-      if authelia_config_default_redirection_url | default(false, true) else {})
     | combine(({"server": authelia_config_server })
       | combine({"tls": authelia_config_server_tls}
         if authelia_config_server_tls_key | default(false, true) else {}))
@@ -99,7 +97,10 @@ authelia_config_webauthn:
   timeout: "{{ authelia_config_webauthn_timeout }}"
   display_name: "{{ authelia_config_webauthn_display_name }}"
   attestation_conveyance_preference: "{{ authelia_config_webauthn_attestation_conveyance_preference }}"
-  user_verification: "{{ authelia_config_webauthn_user_verification }}"
+  selection_criteria:
+    attachment: "{{ authelia_config_webauthn_selection_criteria_attachment }}"
+    discoverability: "{{ authelia_config_webauthn_selection_criteria_discoverability }}"
+    user_verification: "{{ authelia_config_webauthn_selection_criteria_user_verification }}"
 authelia_config_duo_api:
   hostname: "{{ authelia_config_duo_api_hostname }}"
   integration_key: "{{ authelia_config_duo_api_integration_key }}"
@@ -128,7 +129,7 @@ authelia_config_authentication_backend_password_reset:
   disable: "{{ authelia_config_authentication_backend_password_reset_disable }}"
 authelia_config_authentication_backend_ldap:
   implementation: "{{ authelia_config_authentication_backend_ldap_implementation }}"
-  url: "{{ authelia_config_authentication_backend_ldap_url }}"
+  address: "{{ authelia_config_authentication_backend_ldap_address }}"
   timeout: "{{ authelia_config_authentication_backend_ldap_timeout }}"
   start_tls: "{{ authelia_config_authentication_backend_ldap_start_tls }}"
   tls:
@@ -182,12 +183,12 @@ authelia_config_session: >-2
   }}
 authelia_config_session_base:
   name: "{{ authelia_config_session_name }}"
-  domain: "{{ authelia_config_session_domain }}"
   same_site: "{{ authelia_config_session_same_site }}"
   secret: "{{ authelia_config_session_secret }}"
   expiration: "{{ authelia_config_session_expiration }}" 
   inactivity: "{{ authelia_config_session_inactivity }}"
   remember_me: "{{ authelia_config_session_remember_me }}"
+  cookies: "{{ authelia_config_session_cookies }}"
 authelia_config_session_redis: >-2
   {{
     {
@@ -274,3 +275,9 @@ authelia_config_notifier_smtp:
   tls:
     skip_verify: "{{ authelia_config_notifier_smtp_tls_skip_verify }}"
     minimum_version: "{{ authelia_config_notifier_smtp_tls_minimum_version }}"
+authelia_config_identity_validation:
+  reset_password: "{{ authelia_config_identity_validation_reset_password }}"
+authelia_config_identity_validation_reset_password:
+  jwt_secret: "{{ authelia_config_identity_validation_reset_password_jwt_secret }}"
+  jwt_lifespan: "{{ authelia_config_identity_validation_reset_password_jwt_lifespan }}"
+  jwt_algorithm: "{{ authelia_config_identity_validation_reset_password_jwt_algorithm }}"

roles/ghost/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 ghost_domain: ~
-ghost_version: "5.113.1"
+ghost_version: "5.129.1"
 ghost_user: ghost
 ghost_user_group: ghost
 ghost_base_path: /opt/ghost

roles/gitea/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-gitea_version: "1.23.6"
+gitea_version: "1.24.5"
 gitea_user: git
 gitea_run_user: "{{ gitea_user }}"
 gitea_base_path: "/opt/gitea"

roles/hedgedoc/defaults/main/main.yml

@@ -1,6 +1,6 @@
 ---
 hedgedoc_user: hedgedoc
-hedgedoc_version: "1.10.2"
+hedgedoc_version: "1.10.3"
 
 hedgedoc_state: present
 hedgedoc_deployment_method: docker

roles/jellyfin/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 jellyfin_user: jellyfin
-jellyfin_version: "10.10.6"
+jellyfin_version: "10.10.7"
 jellyfin_state: present
 jellyfin_deployment_method: docker
 

roles/keycloak/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-keycloak_version: "26.1.4"
+keycloak_version: "26.3.2"
 keycloak_container_name: keycloak
 
 keycloak_container_image_upstream_registry: quay.io

roles/phpldapadmin/README.md

@@ -0,0 +1,3 @@
+# `finallycoffee.services.phpldapadmin`
+
+Role to deploy and configure [phpldapadmin](https://github.com/leenooks/phpLDAPadmin).

roles/phpldapadmin/defaults/main/container.yml

@@ -0,0 +1,39 @@
+---
+phpldapadmin_container_name: phpldapadmin
+phpldapadmin_container_image_registry: docker.io
+phpldapadmin_container_image_namespace: phpldapadmin
+phpldapadmin_container_image_name: phpldapadmin
+phpldapadmin_container_image_repository: >-2
+  {{
+    [
+      phpldapadmin_container_image_registry | default([], true),
+      phpldapadmin_container_image_namespace | default([], true),
+      phpldapadmin_container_image_name
+    ] | flatten | join('/')
+  }}
+phpldapadmin_container_image: >-2
+  {{
+    [
+      phpldapadmin_container_image_repository,
+      phpldapadmin_container_image_tag | default(phpldapadmin_version, true)
+    ] | join(':')
+  }}
+phpldapadmin_container_image_tag: ~
+phpldapadmin_container_image_source: pull
+phpldapadmin_container_image_force_source: >-2
+  {{ phpldapadmin_container_image_tag | default(false, true) }}
+phpldapadmin_container_env: ~
+phpldapadmin_container_user: ~
+phpldapadmin_container_ports: ~
+phpldapadmin_container_labels: ~
+phpldapadmin_container_volumes: ~
+phpldapadmin_container_networks: ~
+phpldapadmin_container_network_mode: ~
+phpldapadmin_container_dns_servers: ~
+phpldapadmin_container_etc_hosts: ~
+phpldapadmin_container_memory: ~
+phpldapadmin_container_memory_swap: ~
+phpldapadmin_container_memory_reservation: ~
+phpldapadmin_container_restart_policy: "on-failure"
+phpldapadmin_container_state: >-2
+  {{ (phpldapadmin_state == 'present') | ternary('started', 'absent') }}

roles/phpldapadmin/defaults/main/main.yml

@@ -0,0 +1,5 @@
+---
+phpldapadmin_version: "2.2.2"
+
+phpldapadmin_state: present
+phpldapadmin_deployment_method: docker

roles/phpldapadmin/tasks/deploy-docker.yml

@@ -0,0 +1,27 @@
+---
+- name: Ensure phpldapadmin container image '{{ phpldapadmin_container_image }}' is {{ phpldapadmin_state }}
+  community.docker.docker_image:
+    name: "{{ phpldapadmin_container_image }}"
+    state: "{{ phpldapadmin_state }}"
+    source: "{{ phpldapadmin_container_image_source }}"
+    force_source: "{{ phpldapadmin_container_image_force_source }}"
+
+- name: Ensure phpldapadmin container '{{ phpldapadmin_container_name }}' is {{ phpldapadmin_container_state }}
+  community.docker.docker_container:
+    name: "{{ phpldapadmin_container_name }}"
+    image: "{{ phpldapadmin_container_image }}"
+    env: "{{ phpldapadmin_container_env | default(omit, true) }}"
+    user: "{{ phpldapadmin_container_user | default(omit, true) }}"
+    ports: "{{ phpldapadmin_container_ports | default(omit, true) }}"
+    labels: "{{ phpldapadmin_container_labels | default(omit, true) }}"
+    volumes: "{{ phpldapadmin_container_volumes | default(omit, true) }}"
+    networks: "{{ phpldapadmin_container_networks | default(omit, true) }}"
+    network_mode: "{{ phpldapadmin_container_network_mode | default(omit, true) }}"
+    dns_servers: "{{ phpldapadmin_container_dns_servers | default(omit, true) }}"
+    etc_hosts: "{{ phpldapadmin_container_etc_hosts | default(omit, true) }}"
+    memory: "{{ phpldapadmin_container_memory | default(omit, true) }}"
+    memory_swap: "{{ phpldapadmin_container_memory_swap | default(omit, true) }}"
+    memory_reservation: >-2
+      {{ phpldapadmin_container_memory_reservation | default(omit, true) }}
+    restart_policy: "{{ phpldapadmin_container_restart_policy | default(omit, true) }}"
+    state: "{{ phpldapadmin_container_state }}"

roles/phpldapadmin/tasks/main.yml

@@ -0,0 +1,18 @@
+---
+- name: Ensure 'phpldapadmin_state' is valid
+  ansible.builtin.fail:
+    msg: >-2
+      Unsupported state '{{ phpldapadmin_state }}'!
+      Supported states are {{ phpldapadmin_states | join(', ') }}
+  when: phpldapadmin_state not in phpldapadmin_states
+
+- name: Ensure 'phpldapadmin_deployment_method' is valid
+  ansible.builtin.fail:
+    msg: >-2
+      Unsupported deployment method '{{ phpldapadmin_deployment_method }}'!
+      Supported deployment methods are {{ phpldapadmin_deployment_methods | join(', ') }}
+  when: phpldapadmin_deployment_method not in phpldapadmin_deployment_methods
+
+- name: Deploy using {{ phpldapadmin_deployment_method }}
+  ansible.builtin.import_tasks:
+    file: "deploy-{{ phpldapadmin_deployment_method }}.yml"

roles/phpldapadmin/vars/main.yml

@@ -0,0 +1,6 @@
+---
+phpldapadmin_states:
+  - "present"
+  - "absent"
+phpldapadmin_deployment_methods:
+  - "docker"

roles/snipe_it/defaults/main/container.yml

@@ -1,6 +1,6 @@
 ---
 snipe_it_container_image_registry: docker.io
-snipe_it_container_image_namespace: snipe
+snipe_it_container_image_namespace: 'snipe'
 snipe_it_container_image_name: 'snipe-it'
 snipe_it_container_image_tag: ~
 snipe_it_container_image_flavour: alpine

roles/snipe_it/defaults/main/main.yml

@@ -1,6 +1,6 @@
 ---
 snipe_it_user: snipeit
-snipe_it_version: "8.0.4"
+snipe_it_version: "8.2.1"
 snipe_it_domain: ~
 snipe_it_state: present
 snipe_it_deployment_method: docker

roles/vaultwarden/defaults/main/main.yml

@@ -1,6 +1,6 @@
 ---
 vaultwarden_user: vaultwarden
-vaultwarden_version: "1.33.2"
+vaultwarden_version: "1.34.3"
 
 vaultwarden_config_file: "/etc/vaultwarden/config.json"
 vaultwarden_config_directory: "{{ vaultwarden_config_file | dirname }}"

roles/vaultwarden/tasks/deploy-docker.yml

@@ -20,3 +20,5 @@
     dns_servers: "{{ vaultwarden_container_dns_servers | default(omit, true) }}"
     restart_policy: "{{ vaultwarden_container_restart_policy | default(omit, true) }}"
     state: "{{ vaultwarden_container_state | default(omit, true) }}"
+    comparisons:
+      'env': 'strict'