diff --git a/VERSIONS.diff.md b/VERSIONS.diff.md index 8908457..00cf25f 100644 --- a/VERSIONS.diff.md +++ b/VERSIONS.diff.md @@ -1,14 +1,4 @@ **Stable Updates Published** -* [Appservice Draupnir For All](https://github.com/the-draupnir-project/Draupnir): [v2.0.2](https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.0.2) -> [v2.1.0](https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.1.0) -* [Authentication Service](https://github.com/element-hq/matrix-authentication-service): [0.12.0](https://github.com/element-hq/matrix-authentication-service/releases/tag/0.12.0) -> [0.13.0](https://github.com/element-hq/matrix-authentication-service/releases/tag/0.13.0) -* Authentication Service Syn2Mas: 0.12.0 -> 0.13.0 -* Borgmatic: 1.9.6 -> 1.9.9 -* [Corporal](https://github.com/devture/matrix-corporal): [3.1.2](https://github.com/devture/matrix-corporal/releases/tag/3.1.2) -> [3.1.3](https://github.com/devture/matrix-corporal/releases/tag/3.1.3) -* [Draupnir](https://github.com/the-draupnir-project/Draupnir): [v2.0.2](https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.0.2) -> [v2.1.0](https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.1.0) -* [Exim Relay](https://github.com/devture/exim-relay): [4.98-r0-3](https://github.com/devture/exim-relay/releases/tag/4.98-r0-3) -> [4.98-r0-4](https://github.com/devture/exim-relay/releases/tag/4.98-r0-4) -* [Grafana](https://github.com/grafana/grafana): [11.4.0](https://github.com/grafana/grafana/releases/tag/v11.4.0) -> [11.5.1](https://github.com/grafana/grafana/releases/tag/v11.5.1) -* [Jitsi](https://github.com/jitsi/docker-jitsi-meet): [stable-9955](https://github.com/jitsi/docker-jitsi-meet/releases/tag/stable-9955) -> [stable-10008](https://github.com/jitsi/docker-jitsi-meet/releases/tag/stable-10008) -* [Synapse Reverse Proxy Companion](https://github.com/nginx/nginx): [1.27.3-alpine](https://github.com/nginx/nginx/releases/tag/release-1.27.3) -> [1.27.4-alpine](https://github.com/nginx/nginx/releases/tag/release-1.27.4) -* [Traefik](https://github.com/traefik/traefik): [v3.3.2](https://github.com/traefik/traefik/releases/tag/v3.3.2) -> [v3.3.3](https://github.com/traefik/traefik/releases/tag/v3.3.3) -* [Vaultwarden](https://github.com/dani-garcia/vaultwarden): [1.33.0](https://github.com/dani-garcia/vaultwarden/releases/tag/1.33.0) -> [1.33.1](https://github.com/dani-garcia/vaultwarden/releases/tag/1.33.1) +* [Alertmanager Receiver](https://github.com/metio/matrix-alertmanager-receiver): [2024.12.18](https://github.com/metio/matrix-alertmanager-receiver/releases/tag/2024.12.18) -> [2025.2.9](https://github.com/metio/matrix-alertmanager-receiver/releases/tag/2025.2.9) +* [Vaultwarden](https://github.com/dani-garcia/vaultwarden): [1.33.1](https://github.com/dani-garcia/vaultwarden/releases/tag/1.33.1) -> [1.33.2](https://github.com/dani-garcia/vaultwarden/releases/tag/1.33.2) diff --git a/VERSIONS.md b/VERSIONS.md index c009639..8e11309 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -1,4 +1,4 @@ -* Alertmanager Receiver: 2024.12.18 +* Alertmanager Receiver: 2025.2.9 * Appservice Discord: v4.0.0 * Appservice Draupnir For All: v2.1.0 * Appservice Irc: 1.0.1 @@ -95,7 +95,7 @@ * Uptime Kuma: 1.23.16 * User Verification Service: v3.0.0 * Valkey: 8.0.1 -* Vaultwarden: 1.33.1 +* Vaultwarden: 1.33.2 * Wechat: 0.2.4 * Wechat Agent: 0.0.1 * Whatsapp: v0.11.2 diff --git a/roles/galaxy/docker/meta/.galaxy_install_info b/roles/galaxy/docker/meta/.galaxy_install_info index 56d4500..9f40eac 100644 --- a/roles/galaxy/docker/meta/.galaxy_install_info +++ b/roles/galaxy/docker/meta/.galaxy_install_info @@ -1,3 +1,3 @@ -install_date: 'Sat 11 Jan 2025 04:21:04 PM ' -install_commit: ffc1374a227fbb1a36415ad4df71b6450d323d8f -version: 7.4.4 +install_date: 'Mon 10 Feb 2025 10:28:05 AM ' +install_commit: a16b26b8e28bf644853f0f5a57aa0eacef36299b +version: 7.4.5 diff --git a/roles/galaxy/docker/molecule/default/converge.yml b/roles/galaxy/docker/molecule/default/converge.yml index 629095b..6f14c66 100644 --- a/roles/galaxy/docker/molecule/default/converge.yml +++ b/roles/galaxy/docker/molecule/default/converge.yml @@ -1,7 +1,7 @@ --- - name: Converge hosts: all - become: true + # become: true pre_tasks: - name: Update apt cache. diff --git a/roles/galaxy/docker/molecule/default/verify.yml b/roles/galaxy/docker/molecule/default/verify.yml new file mode 100644 index 0000000..45e24fc --- /dev/null +++ b/roles/galaxy/docker/molecule/default/verify.yml @@ -0,0 +1,51 @@ +--- +- name: Verify Docker Role + hosts: all + tasks: + - name: Verify Docker binary is available + command: docker version + register: docker_version_result + changed_when: false + failed_when: docker_version_result.rc != 0 + + - name: Show Docker version details + debug: + msg: > + Docker Version Output: + {{ docker_version_result.stdout_lines | join('\n') }} + + - name: Verify Docker service is running + command: systemctl is-active docker + register: docker_service_status + when: ansible_service_mgr == 'systemd' + changed_when: false + failed_when: docker_service_status.stdout.strip() != "active" + + - name: Display Docker service status + debug: + msg: "Docker service is {{ docker_service_status.stdout.strip() }}" + when: ansible_service_mgr == 'systemd' + + - name: Pull the 'hello-world' image + command: docker pull hello-world + register: docker_pull_result + changed_when: true + failed_when: docker_pull_result.rc != 0 + + - name: Show result of pulling the 'hello-world' image + debug: + msg: > + Pulling 'hello-world' completed with output: + {{ docker_pull_result.stdout_lines | join('\n') }} + + - name: Run a test container (hello-world) + command: docker run --rm hello-world + register: docker_run_result + changed_when: true + failed_when: docker_run_result.rc != 0 + + - name: Display test container output + debug: + msg: > + Running 'hello-world' container completed with output: + {{ docker_run_result.stdout_lines | join('\n') }} diff --git a/roles/galaxy/docker/tasks/setup-Debian.yml b/roles/galaxy/docker/tasks/setup-Debian.yml index a1c7d3e..2c4db41 100644 --- a/roles/galaxy/docker/tasks/setup-Debian.yml +++ b/roles/galaxy/docker/tasks/setup-Debian.yml @@ -6,7 +6,7 @@ - name: Ensure old apt source list is not present in /etc/apt/sources.list.d ansible.builtin.file: - path: /etc/apt/sources.list.d/download_docker_com_linux_ubuntu.list + path: "/etc/apt/sources.list.d/download_docker_com_linux_{{ docker_apt_ansible_distribution }}.list" state: absent - name: Ensure the repo referencing the previous trusted.gpg.d key is not present diff --git a/roles/galaxy/vaultwarden/defaults/main.yml b/roles/galaxy/vaultwarden/defaults/main.yml index f009df0..39a88ec 100644 --- a/roles/galaxy/vaultwarden/defaults/main.yml +++ b/roles/galaxy/vaultwarden/defaults/main.yml @@ -7,7 +7,7 @@ vaultwarden_enabled: true vaultwarden_identifier: vaultwarden -vaultwarden_version: 1.33.1 +vaultwarden_version: 1.33.2 # The fully-qualified name of your Vaultwarden server (e.g. `vaultwarden.example.com`) vaultwarden_hostname: '' @@ -257,6 +257,7 @@ vaultwarden_container_labels_traefik_path_prefix: "{{ vaultwarden_path_prefix }} vaultwarden_container_labels_traefik_rule_ui: "Host(`{{ vaultwarden_container_labels_traefik_hostname }}`){% if vaultwarden_container_labels_traefik_path_prefix != '/' %} && PathPrefix(`{{ vaultwarden_container_labels_traefik_path_prefix | quote }}`){% endif %}" vaultwarden_container_labels_traefik_priority: 0 vaultwarden_container_labels_traefik_entrypoints: web-secure +vaultwarden_container_labels_traefik_tls: "{{ vaultwarden_container_labels_traefik_entrypoints != 'web' }}" vaultwarden_container_labels_traefik_tls_certResolver: default # noqa var-naming # Controls whether a compression middleware will be injected into the middlewares list. diff --git a/roles/galaxy/vaultwarden/meta/.galaxy_install_info b/roles/galaxy/vaultwarden/meta/.galaxy_install_info index bb70f58..7fcee2e 100644 --- a/roles/galaxy/vaultwarden/meta/.galaxy_install_info +++ b/roles/galaxy/vaultwarden/meta/.galaxy_install_info @@ -1,3 +1,3 @@ -install_date: 'Mon 03 Feb 2025 02:43:09 PM ' -install_commit: 85363a91a0efd1a7ca4b7b714228b9b60d017cf0 -version: v1.33.1-0 +install_date: 'Mon 10 Feb 2025 10:28:05 AM ' +install_commit: e4277ca249d9cb57f10a0e41672de3a59f671d00 +version: v1.33.2-0 diff --git a/roles/galaxy/vaultwarden/templates/labels.j2 b/roles/galaxy/vaultwarden/templates/labels.j2 index e398789..92bd829 100644 --- a/roles/galaxy/vaultwarden/templates/labels.j2 +++ b/roles/galaxy/vaultwarden/templates/labels.j2 @@ -33,7 +33,11 @@ traefik.http.routers.{{ vaultwarden_identifier }}.priority={{ vaultwarden_contai {% endif %} traefik.http.routers.{{ vaultwarden_identifier }}.service={{ vaultwarden_identifier }} + +{% if vaultwarden_container_labels_traefik_tls %} traefik.http.routers.{{ vaultwarden_identifier }}.tls.certResolver={{ vaultwarden_container_labels_traefik_tls_certResolver }} +{% endif %} + traefik.http.routers.{{ vaultwarden_identifier }}.entrypoints={{ vaultwarden_container_labels_traefik_entrypoints }} traefik.http.services.{{ vaultwarden_identifier }}.loadbalancer.server.port={{ vaultwarden_config_rocket_port }} {% endif %} diff --git a/upstream b/upstream index c03140c..97c0f1a 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit c03140c825f5cd65f9edcf29d3d21f12a8ada050 +Subproject commit 97c0f1ae7c51eecea7459b21f75b0c5a577a2805