Merge branch 'main' into notfellchen

This commit is contained in:
moanos 2024-04-17 22:53:39 +02:00
commit f8a5f43b13
3 changed files with 18 additions and 8 deletions

View file

@ -5,7 +5,7 @@
* Authelia: 4.37.5
* Authentik: 2024.2.2
* Borg: 1.2.8
* Borgmatic: 1.8.9
* Borgmatic: 1.8.10
* Changedetection: 0.45.17
* Changedetection Playwright Driver: latest
* Clickhouse: 23.10.5.20
@ -19,12 +19,12 @@
* Echoip: latest
* Etcd: 3.5.11
* Exim Relay: 4.97.1-r0-0
* Firezone: 0.7.35
* Firezone: 0.7.36
* Focalboard: 7.10.4
* Forgejo: 1.21.10-0
* Freshrss: 1.23.0
* Funkwhale: 1.4.0
* Gitea: 1.21.10
* Gitea: 1.21.11
* Gotosocial: 0.15.0
* Grafana: 10.4.2
* Healthchecks: v3.3

View file

@ -2199,9 +2199,19 @@ grafana_base_path: "{{ mash_playbook_base_path }}/{{ mash_playbook_service_base_
grafana_uid: "{{ mash_playbook_uid }}"
grafana_gid: "{{ mash_playbook_gid }}"
# role-specific:exim_relay
grafana_smtp_enabled: "{{ exim_relay_enabled | default(false) }}"
grafana_smtp_host: "{{ exim_relay_identifier if exim_relay_enabled else '' }}"
grafana_smtp_port: 8025
grafana_smtp_from_address: "{{ exim_relay_sender_address if exim_relay_enabled else '' }}"
# /role-specific:exim_relay
grafana_container_additional_networks_auto: |
{{
([mash_playbook_reverse_proxyable_services_additional_network] if (grafana_container_labels_traefik_enabled and mash_playbook_reverse_proxyable_services_additional_network) else [])
+
([exim_relay_container_network | default('mash-exim-relay')] if (exim_relay_enabled | default(false) and grafana_smtp_host == exim_relay_identifier | default('mash-exim-relay') and grafana_container_network != exim_relay_container_network) else [])
}}
grafana_container_labels_traefik_enabled: "{{ mash_playbook_traefik_labels_enabled }}"

View file

@ -21,7 +21,7 @@
name: authelia
activation_prefix: authelia_
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-authentik.git
version: v2024.2.2-0
version: v2024.2.3-0
name: authentik
activation_prefix: authentik_
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-aux.git
@ -29,7 +29,7 @@
name: auxiliary
activation_prefix: aux_
- src: git+https://gitlab.com/etke.cc/roles/backup_borg.git
version: v1.2.8-1.8.9-0
version: v1.2.8-1.8.10-0
name: backup_borg
activation_prefix: backup_borg_
- src: git+https://github.com/nielscil/ansible-role-changedetection.git
@ -85,7 +85,7 @@
name: etcd
activation_prefix: etcd_
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-exim-relay.git
version: v4.97.1-r0-0-1
version: v4.97.1-r0-0-2
name: exim_relay
activation_prefix: exim_relay_
- src: git+https://gitlab.com/etke.cc/roles/fail2ban.git
@ -93,7 +93,7 @@
name: fail2ban
activation_prefix: system_security_fail2ban_
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-firezone.git
version: v0.7.35-7
version: v0.7.36-0
name: firezone
activation_prefix: firezone_
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-focalboard.git
@ -113,7 +113,7 @@
name: funkwhale
activation_prefix: funkwhale_
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-gitea.git
version: v1.21.10-0
version: v1.21.11-0
name: gitea
activation_prefix: gitea_
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-gotosocial.git