refactor(authelia): add state and deployment_method role parameters

galaxy.yml

@@ -1,13 +1,13 @@
 namespace: finallycoffee
 name: services
-version: "0.1.12"
+version: 0.1.10
 readme: README.md
 authors:
 - transcaffeine <transcaffeine@finally.coffee>
 description: Various ansible roles useful for automating infrastructure
 dependencies:
-  "community.crypto": "^2.22.0"
+  "community.crypto": "^2.0.0"
-  "community.docker": "^4.0.0"
+  "community.docker": "^3.0.0"
 license_file: LICENSE.md
 build_ignore:
 - '*.tar.gz'

roles/authelia/defaults/main.yml

@@ -4,6 +4,9 @@ authelia_user: authelia
 authelia_base_dir: /opt/authelia
 authelia_domain: authelia.example.org
 
+authelia_state: present
+authelia_deployment_method: docker
+
 authelia_config_dir: "{{ authelia_base_dir }}/config"
 authelia_config_file: "{{ authelia_config_dir }}/config.yaml"
 authelia_data_dir: "{{ authelia_base_dir }}/data"
@@ -42,7 +45,8 @@ authelia_container_ports: ~
 authelia_container_networks: ~
 authelia_container_purge_networks: ~
 authelia_container_restart_policy: unless-stopped
-authelia_container_state: started
+authelia_container_state: >-2
+  {{ (authelia_state == 'present' | ternary('started', 'absent') }}
 
 authelia_container_listen_port: 9091
 authelia_tls_minimum_version: TLS1.2

roles/authelia/tasks/main.yml

@@ -1,16 +1,20 @@
 ---
+- name: Ensure state is valid
+  ansible.builtin.fail:
+    msg: "Invalid state '{{ authelia_state }}'! Valid states are {{ authelia_states | join(', ') }}"
+  when: authelia_state not in authelia_states
 
-- name: Ensure user {{ authelia_user }} exists
+- name: Ensure user {{ authelia_user }} is {{ authelia_state }}
   ansible.builtin.user:
     name: "{{ authelia_user }}"
-    state: present
+    state: "{{ authelia_state }}"
     system: true
   register: authelia_user_info
 
 - name: Ensure host directories are created with correct permissions
   ansible.builtin.file:
     path: "{{ item.path }}"
-    state: directory
+    state: "{{ (authelia_state == 'present') | ternary('directory', 'absent') }}"
     owner: "{{ item.owner | default(authelia_user) }}"
     group: "{{ item.group | default(authelia_user) }}"
     mode: "{{ item.mode | default('0750') }}"
@@ -32,62 +36,9 @@
     owner: "{{ authelia_run_user }}"
     group: "{{ authelia_run_group }}"
     mode: "0640"
+  when: authelia_state == 'present'
   notify: restart-authelia
 
-- name: Ensure sqlite database file exists before mounting it
+- name: Deploy using {{ authelia_deployment_method }}
-  ansible.builtin.file:
+  ansible.builtin.include_tasks:
-    path: "{{ authelia_sqlite_storage_file }}"
+    file: "deploy-{{ authelia_deployment_method }}.yml"
-    state: touch
-    owner: "{{ authelia_run_user }}"
-    group: "{{ authelia_run_group }}"
-    mode: "0640"
-    access_time: preserve
-    modification_time: preserve
-  when: authelia_config_storage_local_path | default(false, true)
-
-- name: Ensure user database exists before mounting it
-  ansible.builtin.file:
-    path: "{{ authelia_user_storage_file }}"
-    state: touch
-    owner: "{{ authelia_run_user }}"
-    group: "{{ authelia_run_group }}"
-    mode: "0640"
-    access_time: preserve
-    modification_time: preserve
-  when: authelia_config_authentication_backend_file_path | default(false, true)
-
-- name: Ensure notification reports file exists before mounting it
-  ansible.builtin.file:
-    path: "{{ authelia_notification_storage_file }}"
-    state: touch
-    owner: "{{ authelia_run_user }}"
-    group: "{{ authelia_run_group }}"
-    mode: "0640"
-    access_time: preserve
-    modification_time: preserve
-  when: authelia_config_notifier_filesystem_filename | default(false, true)
-
-- name: Ensure authelia container image is present
-  community.docker.docker_image:
-    name: "{{ authelia_container_image_ref }}"
-    state: present
-    source: pull
-    force_source: "{{ authelia_container_image_force_pull }}"
-  register: authelia_container_image_info
-
-- name: Ensure authelia container is running
-  community.docker.docker_container:
-    name: "{{ authelia_container_name }}"
-    image: "{{ authelia_container_image_ref }}"
-    env: "{{ authelia_container_env }}"
-    user: "{{ authelia_run_user }}:{{ authelia_run_group }}"
-    ports: "{{ authelia_container_ports | default(omit, true) }}"
-    labels: "{{ authelia_container_labels }}"
-    volumes: "{{ authelia_container_volumes }}"
-    networks: "{{ authelia_container_networks | default(omit, true) }}"
-    etc_hosts: "{{ authelia_container_etc_hosts | default(omit, true) }}"
-    purge_networks: "{{ authelia_container_purge_networks | default(omit, true)}}"
-    restart_policy: "{{ authelia_container_restart_policy }}"
-    recreate: "{{ authelia_container_recreate | default(omit, true) }}"
-    state: "{{ authelia_container_state }}"
-  register: authelia_container_info

roles/authelia/vars/main.yml

@@ -1,4 +1,9 @@
 ---
+authelia_states:
+  - present
+  - absent
+authelia_deployment_methods:
+  - docker
 
 authelia_run_user: "{{ (authelia_user_info.uid) if authelia_user_info is defined else authelia_user }}"
 authelia_run_group: "{{ (authelia_user_info.group) if authelia_user_info is defined else authelia_user }}"

roles/ghost/defaults/main.yml

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

roles/gitea/defaults/main.yml

@@ -32,7 +32,6 @@ gitea_container_extra_labels: {}
 gitea_container_extra_ports: []
 gitea_container_extra_volumes: []
 gitea_container_state: started
-gitea_container_user: ~
 
 # container defaults
 gitea_container_base_volumes:

roles/gitea/tasks/main.yml

@@ -1,4 +1,5 @@
 ---
+
 - name: Ensure gitea user '{{ gitea_user }}' is present
   ansible.builtin.user:
     name: "{{ gitea_user }}"
@@ -74,7 +75,6 @@
     published_ports: "{{ gitea_container_ports }}"
     restart_policy: "{{ gitea_container_restart_policy }}"
     state: "{{ gitea_container_state }}"
-    user: "{{ gitea_container_user | default(omit, true) }}"
 
 - name: Ensure given configuration is set in the config file
   ansible.builtin.ini_file:

roles/hedgedoc/defaults/main/main.yml

@@ -1,6 +1,6 @@
 ---
 hedgedoc_user: hedgedoc
-hedgedoc_version: "1.10.1"
+hedgedoc_version: "1.10.0"
 
 hedgedoc_state: present
 hedgedoc_deployment_method: docker

roles/jellyfin/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 jellyfin_user: jellyfin
-jellyfin_version: "10.10.5"
+jellyfin_version: "10.10.3"
 jellyfin_state: present
 
 jellyfin_base_path: /opt/jellyfin

roles/keycloak/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-keycloak_version: "26.1.0"
+keycloak_version: 26.0.7
 keycloak_container_name: keycloak
 
 keycloak_container_image_upstream_registry: quay.io

roles/keycloak/templates/Dockerfile.j2

@@ -10,9 +10,7 @@ ENV KC_DB=$DB_VENDOR
 
 WORKDIR {{ keycloak_container_working_directory }}
 
-{% if keycloak_container_image_add_local_providers | default(true) %}
 ADD ./providers/* providers/
-{% endif %}
 # Workaround to set correct mode on jar files
 USER root
 RUN chmod -R 0770 providers/*

roles/vaultwarden/defaults/main/main.yml

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