Skip to content

Commit

Permalink
update upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
aine-etke committed Jan 21, 2025
1 parent 32192fe commit 8bae97c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions VERSIONS.diff.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
* [Appservice Draupnir For All](https://github.com/the-draupnir-project/Draupnir): [1.87.0](https://github.com/the-draupnir-project/Draupnir/releases/tag/v1.87.0) -> [v2.0.1](https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.0.1)
* Borgmatic: 1.9.5 -> 1.9.6
* [Draupnir](https://github.com/the-draupnir-project/Draupnir): [v1.87.0](https://github.com/the-draupnir-project/Draupnir/releases/tag/v1.87.0) -> [v2.0.1](https://github.com/the-draupnir-project/Draupnir/releases/tag/v2.0.1)
* [Dynamic Dns](https://github.com/linuxserver/docker-ddclient): [3.11.2](https://github.com/linuxserver/docker-ddclient/releases/tag/3.11.2) -> [4.0.0](https://github.com/linuxserver/docker-ddclient/releases/tag/4.0.0)
2 changes: 1 addition & 1 deletion VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* Discord: v0.7.2
* Docker Compose: v2.32.1
* Draupnir: v2.0.1
* Dynamic Dns: 3.11.2
* Dynamic Dns: 4.0.0
* Element: v1.11.90
* Email2Matrix: 1.1.0
* Etherpad: 2.2.6
Expand Down
1 change: 1 addition & 0 deletions releases.opml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<outline text="chatgpt" title="chatgpt" type="rss" htmlUrl="https://github.com/matrixgpt/matrix-chatgpt-bot" xmlUrl="https://github.com/matrixgpt/matrix-chatgpt-bot/releases.atom" />
<outline text="cinny" title="cinny" type="rss" htmlUrl="https://github.com/ajbura/cinny" xmlUrl="https://github.com/ajbura/cinny/releases.atom" />
<outline text="conduit" title="conduit" type="rss" htmlUrl="https://gitlab.com/famedly/conduit" xmlUrl="https://gitlab.com/famedly/conduit/-/tags?format=atom" />
<outline text="conduwuit" title="conduwuit" type="rss" htmlUrl="https://github.com/girlbossceo/conduwuit" xmlUrl="https://github.com/girlbossceo/conduwuit/releases.atom" />
<outline text="container_socket_proxy" title="container_socket_proxy" type="rss" htmlUrl="https://github.com/Tecnativa/docker-socket-proxy" xmlUrl="https://github.com/Tecnativa/docker-socket-proxy/releases.atom" />
<outline text="corporal" title="corporal" type="rss" htmlUrl="https://github.com/devture/matrix-corporal" xmlUrl="https://github.com/devture/matrix-corporal/releases.atom" />
<outline text="coturn" title="coturn" type="rss" htmlUrl="https://github.com/coturn/coturn" xmlUrl="https://github.com/coturn/coturn/releases.atom" />
Expand Down
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated 51 files
+17 −2 CHANGELOG.md
+1 −0 README.md
+2 −1 docs/configuring-playbook-alertmanager-receiver.md
+10 −9 docs/configuring-playbook-appservice-draupnir-for-all.md
+2 −1 docs/configuring-playbook-bot-chatgpt.md
+62 −35 docs/configuring-playbook-bot-draupnir.md
+2 −1 docs/configuring-playbook-bot-go-neb.md
+2 −1 docs/configuring-playbook-bot-maubot.md
+36 −11 docs/configuring-playbook-bot-mjolnir.md
+2 −1 docs/configuring-playbook-bridge-appservice-kakaotalk.md
+4 −2 docs/configuring-playbook-conduit.md
+95 −0 docs/configuring-playbook-conduwuit.md
+2 −1 docs/configuring-playbook-dimension.md
+2 −1 docs/configuring-playbook-email.md
+2 −1 docs/configuring-playbook-email2matrix.md
+4 −2 docs/configuring-playbook-jitsi.md
+2 −1 docs/configuring-playbook-matrix-corporal.md
+2 −1 docs/configuring-playbook-synapse-admin.md
+4 −2 docs/configuring-playbook-traefik.md
+2 −1 docs/configuring-playbook-user-verification-service.md
+2 −0 docs/configuring-playbook.md
+1 −0 docs/container-images.md
+1 −1 docs/howto-srv-server-delegation.md
+2 −1 docs/installing.md
+2 −1 docs/maintenance-synapse.md
+2 −1 docs/obtaining-access-tokens.md
+6 −3 docs/registering-users.md
+67 −1 group_vars/matrix_servers
+1 −1 i18n/requirements.txt
+1 −1 roles/custom/matrix-base/defaults/main.yml
+1 −1 roles/custom/matrix-base/tasks/validate_config.yml
+17 −16 roles/custom/matrix-bot-draupnir/defaults/main.yml
+1 −1 roles/custom/matrix-conduit/defaults/main.yml
+189 −0 roles/custom/matrix-conduwuit/defaults/main.yml
+60 −0 roles/custom/matrix-conduwuit/tasks/install.yml
+29 −0 roles/custom/matrix-conduwuit/tasks/main.yml
+23 −0 roles/custom/matrix-conduwuit/tasks/self_check_client_api.yml
+28 −0 roles/custom/matrix-conduwuit/tasks/self_check_federation_api.yml
+59 −0 roles/custom/matrix-conduwuit/tasks/setup_install.yml
+19 −0 roles/custom/matrix-conduwuit/tasks/setup_uninstall.yml
+19 −0 roles/custom/matrix-conduwuit/tasks/uninstall.yml
+11 −0 roles/custom/matrix-conduwuit/tasks/validate_config.yml
+1,538 −0 roles/custom/matrix-conduwuit/templates/conduwuit.toml.j2
+1 −0 roles/custom/matrix-conduwuit/templates/env.j2
+165 −0 roles/custom/matrix-conduwuit/templates/labels.j2
+51 −0 roles/custom/matrix-conduwuit/templates/systemd/matrix-conduwuit.service.j2
+4 −0 roles/custom/matrix-conduwuit/vars/main.yml
+1 −1 roles/custom/matrix-dynamic-dns/defaults/main.yml
+1 −1 roles/custom/matrix-dynamic-dns/templates/systemd/matrix-dynamic-dns.service.j2
+5 −0 roles/custom/matrix-user-creator/tasks/util/ensure_user_registered_conduwuit.yml
+1 −0 setup.yml

0 comments on commit 8bae97c

Please sign in to comment.