Skip to content

Commit

Permalink
update upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
aine-etke committed Feb 10, 2025
1 parent 9bdb889 commit ba91b5c
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 24 deletions.
14 changes: 2 additions & 12 deletions VERSIONS.diff.md
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions VERSIONS.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions roles/galaxy/docker/meta/.galaxy_install_info
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion roles/galaxy/docker/molecule/default/converge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: Converge
hosts: all
become: true
# become: true

pre_tasks:
- name: Update apt cache.
Expand Down
51 changes: 51 additions & 0 deletions roles/galaxy/docker/molecule/default/verify.yml
Original file line number Diff line number Diff line change
@@ -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') }}
2 changes: 1 addition & 1 deletion roles/galaxy/docker/tasks/setup-Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion roles/galaxy/vaultwarden/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ''
Expand Down Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions roles/galaxy/vaultwarden/meta/.galaxy_install_info
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions roles/galaxy/vaultwarden/templates/labels.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated 58 files
+1 −1 CHANGELOG.md
+1 −1 README.md
+1 −1 docs/configuring-playbook-bot-matrix-registration-bot.md
+0 −3 docs/configuring-playbook-bridge-appservice-webhooks.md
+2 −2 docs/configuring-playbook-bridge-hookshot.md
+0 −1 docs/configuring-playbook-bridge-matrix-bridge-sms.md
+13 −0 docs/configuring-playbook-bridge-mautrix-discord.md
+10 −0 docs/configuring-playbook-bridge-mautrix-facebook.md
+13 −0 docs/configuring-playbook-bridge-mautrix-gmessages.md
+12 −0 docs/configuring-playbook-bridge-mautrix-googlechat.md
+12 −0 docs/configuring-playbook-bridge-mautrix-instagram.md
+13 −0 docs/configuring-playbook-bridge-mautrix-meta-instagram.md
+13 −0 docs/configuring-playbook-bridge-mautrix-meta-messenger.md
+13 −0 docs/configuring-playbook-bridge-mautrix-signal.md
+13 −0 docs/configuring-playbook-bridge-mautrix-slack.md
+12 −0 docs/configuring-playbook-bridge-mautrix-telegram.md
+13 −0 docs/configuring-playbook-bridge-mautrix-twitter.md
+13 −0 docs/configuring-playbook-bridge-mautrix-whatsapp.md
+4 −0 docs/configuring-playbook-bridge-mautrix-wsproxy.md
+1 −1 docs/configuring-playbook-bridge-wechat.md
+6 −0 docs/configuring-playbook-jitsi.md
+0 −4 docs/configuring-playbook-matrix-corporal.md
+1 −1 docs/configuring-playbook-pantalaimon.md
+4 −0 docs/configuring-playbook-postgres-backup.md
+118 −47 docs/configuring-playbook-prometheus-grafana.md
+0 −72 docs/configuring-playbook-prometheus-nginxlog.md
+0 −37 docs/configuring-playbook-prometheus-postgres.md
+4 −0 docs/configuring-playbook-s3-goofys.md
+0 −2 docs/configuring-playbook-s3.md
+8 −0 docs/configuring-playbook-sliding-sync-proxy.md
+6 −0 docs/configuring-playbook-synapse-s3-storage-provider.md
+4 −2 docs/configuring-playbook-synapse-usage-exporter.md
+12 −0 docs/configuring-playbook-turn.md
+0 −2 docs/configuring-playbook.md
+1 −1 docs/container-images.md
+1 −1 docs/faq.md
+5 −2 docs/importing-postgres.md
+1 −1 docs/importing-synapse-media-store.md
+3 −1 docs/importing-synapse-sqlite.md
+0 −4 docs/maintenance-synapse.md
+2 −2 examples/reverse-proxies/nginx/matrix.conf
+1 −1 requirements.yml
+1 −1 roles/custom/matrix-alertmanager-receiver/defaults/main.yml
+10 −10 roles/custom/matrix-authentication-service/defaults/main.yml
+1 −1 roles/custom/matrix-authentication-service/tasks/syn2mas.yml
+1 −1 roles/custom/matrix-bot-baibot/tasks/install.yml
+1 −1 roles/custom/matrix-bot-baibot/templates/systemd/matrix-bot-baibot.service.j2
+1 −1 roles/custom/matrix-bridge-hookshot/defaults/main.yml
+1 −1 roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml
+1 −1 roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml
+1 −1 roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml
+1 −1 roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml
+1 −1 roles/custom/matrix-bridge-mautrix-twitter/defaults/main.yml
+1 −1 roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml
+6 −0 roles/custom/matrix-coturn/defaults/main.yml
+2 −2 roles/custom/matrix-coturn/templates/systemd/matrix-coturn-reload.timer.j2
+1 −1 roles/custom/matrix-dimension/tasks/setup_install.yml
+1 −1 roles/custom/matrix-pantalaimon/defaults/main.yml

0 comments on commit ba91b5c

Please sign in to comment.