Use explicit network aliases, add appservice registration script
This commit is contained in:
Jade Ellis
parent
cdb53be5fb
commit
f6e5a5e92b
23 changed files with 30 additions and 22 deletions
|
|
@ -103,6 +103,14 @@
|
|||
- --include="*/"
|
||||
- --include="*.yaml"
|
||||
- --exclude="*"
|
||||
# Reregister appservices:
|
||||
# ls | filter {|n| $n.type == "dir" } | each {|n| open --raw ("./" + $n.name + "/registration.yaml")} | each {|as| nu ~\Code\scripts\scripts\matrix.nu send_message "https://matrix.ellis.link" $env.MATRIX_TOKEN "!1al3YiWSKCq0tASeCX%3Aellis.link" ({
|
||||
# "msgtype":"m.text",
|
||||
# "body":$"!admin appservices register\n\n```\n($as)\n```",
|
||||
# "format":"org.matrix.custom.html",
|
||||
# "formatted_body":$"<p>!admin appservices register</p>\n<pre><code>($as)\n</code></pre>\n",
|
||||
# "m.mentions":{}
|
||||
# } | to json) }
|
||||
- name: Creates freshrss data directory
|
||||
file:
|
||||
path: /var/opt/freshrss
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Label="traefik.http.services.conduwuit.loadbalancer.server.port=6167"
|
|||
Environment="CONDUWUIT_PORT=6167"
|
||||
|
||||
#
|
||||
Network=web.network:ip=10.89.0.248,ip6=fd76:6f6d:f45e:ea1a::fb
|
||||
Network=web.network:ip=10.89.0.248,ip6=fd76:6f6d:f45e:ea1a::fb,alias=cwt-ellis-internal
|
||||
Environment="CONDUWUIT_ADDRESS=[\"10.89.0.248\", \"fd76:6f6d:f45e:ea1a::fb\"]"
|
||||
Label="traefik.docker.network=systemd-web"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ ContainerName=mautrix-bluesky
|
|||
Image=dock.mau.dev/mautrix/bluesky:latest
|
||||
Volume=/var/opt/mautrix/bluesky:/data:z
|
||||
AutoUpdate=registry
|
||||
Network=web.network
|
||||
Network=web.network:alias=as-mautrix-bluesky
|
||||
|
||||
Label="traefik.enable=true"
|
||||
Label="traefik.http.routers.mautrix-bluesky.rule=Host(`mautrix-bluesky.ellis.link`)"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ ContainerName=mautrix-discord
|
|||
Image=dock.mau.dev/mautrix/discord:latest
|
||||
Volume=/var/opt/mautrix/discord:/data:z
|
||||
AutoUpdate=registry
|
||||
Network=web.network
|
||||
Network=web.network:alias=as-mautrix-discord
|
||||
|
||||
Label="traefik.enable=true"
|
||||
Label="traefik.http.routers.mautrix-discord.rule=Host(`mautrix-discord.ellis.link`)"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ ContainerName=mautrix-gmessages
|
|||
Image=dock.mau.dev/mautrix/gmessages:latest
|
||||
Volume=/var/opt/mautrix/gmessages:/data:z
|
||||
AutoUpdate=registry
|
||||
Network=web.network
|
||||
Network=web.network::alias=as-mautrix-gmessages
|
||||
|
||||
Label="traefik.enable=true"
|
||||
Label="traefik.http.routers.mautrix-gmessages.rule=Host(`mautrix-gmessages.ellis.link`)"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ ContainerName=mautrix-meta
|
|||
Image=dock.mau.dev/mautrix/meta:latest
|
||||
Volume=/var/opt/mautrix/meta:/data:z
|
||||
AutoUpdate=registry
|
||||
Network=web.network
|
||||
Network=web.network:alias=as-mautrix-meta
|
||||
|
||||
Label="traefik.enable=true"
|
||||
Label="traefik.http.routers.mautrix-meta.rule=Host(`mautrix-meta.ellis.link`)"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ ContainerName=mautrix-signal
|
|||
Image=dock.mau.dev/mautrix/signal:latest
|
||||
Volume=/var/opt/mautrix/signal:/data:z
|
||||
AutoUpdate=registry
|
||||
Network=web.network
|
||||
Network=web.network:alias=as-mautrix-signal
|
||||
|
||||
Label="traefik.enable=true"
|
||||
Label="traefik.http.routers.mautrix-signal.rule=Host(`mautrix-signal.ellis.link`)"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ ContainerName=mautrix-slack
|
|||
Image=dock.mau.dev/mautrix/slack:latest
|
||||
Volume=/var/opt/mautrix/slack:/data:z
|
||||
AutoUpdate=registry
|
||||
Network=web.network
|
||||
Network=web.network:alias=as-mautrix-slack
|
||||
|
||||
Label="traefik.enable=true"
|
||||
Label="traefik.http.routers.mautrix-slack.rule=Host(`mautrix-slack.ellis.link`)"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ ContainerName=mautrix-whatsapp
|
|||
Image=dock.mau.dev/mautrix/whatsapp:latest
|
||||
Volume=/var/opt/mautrix/whatsapp:/data:z
|
||||
AutoUpdate=registry
|
||||
Network=web.network
|
||||
Network=web.network:alias=as-mautrix-whatsapp
|
||||
|
||||
Label="traefik.enable=true"
|
||||
Label="traefik.http.routers.mautrix-whatsapp.rule=Host(`mautrix-whatsapp.ellis.link`)"
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ appservice:
|
|||
# Like the homeserver address, a local non-https address is recommended when the bridge is on the same machine.
|
||||
# If the bridge is elsewhere, you must secure the connection yourself (e.g. with https or wireguard)
|
||||
# If you want to use https, you need to use a reverse proxy. The bridge does not have TLS support built in.
|
||||
address: http://mautrix-bluesky:29340
|
||||
address: http://as-mautrix-bluesky:29340
|
||||
# A public address that external services can use to reach this appservice.
|
||||
# This is only needed for things like public media. A reverse proxy is generally necessary when using this field.
|
||||
# This value doesn't affect the registration file.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
id: bluesky
|
||||
url: http://mautrix-bluesky:29340
|
||||
url: http://as-mautrix-bluesky:29340
|
||||
as_token: 9OPP6xqAGuqulOqnXOGfgPnzM8cyghJa5MtDNjWHThjmOcCS0IQ8PZqBuyLLpfFh
|
||||
hs_token: Sl7EkoLPyr6mcetgS9MOat3d3autdCdyf5yJfLmGEVHQQFqeh7sKBt6aDwggKml0
|
||||
sender_localpart: rMm1j8cwMahcMPaEe5NOKqFqRc7DXzBJ
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ homeserver:
|
|||
# Changing these values requires regeneration of the registration.
|
||||
appservice:
|
||||
# The address that the homeserver can use to connect to this appservice.
|
||||
address: http://mautrix-discord:29334
|
||||
address: http://as-mautrix-discord:29334
|
||||
|
||||
# The hostname and port where this appservice should listen.
|
||||
hostname: 0.0.0.0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
id: mautrix-discord
|
||||
url: http://mautrix-discord:29334
|
||||
url: http://as-mautrix-discord:29334
|
||||
as_token: mR1qkqQ8XCgJ61ZkhPdPUfgrjpZFVUhwRqizD8AiAsPFKdHVtvwnNVAH4vvDKyks
|
||||
hs_token: F3WF7uirTPUwMoUNBObcjZghoOUikYkFZtV8yPI3l4UxrNvVOjndmW3ev7Ypl099
|
||||
sender_localpart: KFwAMWXBNgYvWToZxHzoxdUvFCGe7W4d
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ appservice:
|
|||
# Like the homeserver address, a local non-https address is recommended when the bridge is on the same machine.
|
||||
# If the bridge is elsewhere, you must secure the connection yourself (e.g. with https or wireguard)
|
||||
# If you want to use https, you need to use a reverse proxy. The bridge does not have TLS support built in.
|
||||
address: http://mautrix-gmessages:29336
|
||||
address: http://as-mautrix-gmessages:29336
|
||||
# A public address that external services can use to reach this appservice.
|
||||
# This is only needed for things like public media. A reverse proxy is generally necessary when using this field.
|
||||
# This value doesn't affect the registration file.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
id: gmessages
|
||||
url: http://mautrix-gmessages:29336
|
||||
url: http://as-mautrix-gmessages:29336
|
||||
as_token: wnU42Rb4pelI5yKKw92sTmjfsT9REURDfVzMg8ViNq2DsFs0lhhDVBx6j0AyLenS
|
||||
hs_token: KY2MyJXVrR10FW2I53MPVC5WzzFOy3HGA34qE8bdmxMkymtvgdV5K7rEtuVe8GfQ
|
||||
sender_localpart: D9hn9fHRxePmuLxki8hcOLD6xiYUbzAf
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ appservice:
|
|||
# Like the homeserver address, a local non-https address is recommended when the bridge is on the same machine.
|
||||
# If the bridge is elsewhere, you must secure the connection yourself (e.g. with https or wireguard)
|
||||
# If you want to use https, you need to use a reverse proxy. The bridge does not have TLS support built in.
|
||||
address: http://mautrix-meta:29319
|
||||
address: http://as-mautrix-meta:29319
|
||||
# A public address that external services can use to reach this appservice.
|
||||
# This is only needed for things like public media. A reverse proxy is generally necessary when using this field.
|
||||
# This value doesn't affect the registration file.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
id: meta
|
||||
url: http://mautrix-meta:29319
|
||||
url: http://as-mautrix-meta:29319
|
||||
as_token: 0lyeofAXPdUo8CGiaRSDf9AznhSn2uwVTWz7rk8uMjzgYoPVmml9HsVV69qw05GY
|
||||
hs_token: niBvXHLbGcwS85ytNyRqRQ4RLHtsE23n3nA62ufulH11Aui7nvVWXNr1Yc59qizm
|
||||
sender_localpart: Th7nrwqlBwmYlwg749Qa8IGlHYPjYQC5
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ appservice:
|
|||
# Like the homeserver address, a local non-https address is recommended when the bridge is on the same machine.
|
||||
# If the bridge is elsewhere, you must secure the connection yourself (e.g. with https or wireguard)
|
||||
# If you want to use https, you need to use a reverse proxy. The bridge does not have TLS support built in.
|
||||
address: http://mautrix-signal:29328
|
||||
address: http://as-mautrix-signal:29328
|
||||
# A public address that external services can use to reach this appservice.
|
||||
# This is only needed for things like public media. A reverse proxy is generally necessary when using this field.
|
||||
# This value doesn't affect the registration file.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
id: signal
|
||||
url: http://mautrix-signal:29328
|
||||
url: http://as-mautrix-signal:29328
|
||||
as_token: ldsvjlrfQ1J20jkEpiLcQWV0ao3s6HnQUnZSoxwD0C9TaC6KtXuIg7BQfLzy0MBS
|
||||
hs_token: IXI940ZGDb0YOugWLBAroVVsl32cUpukL8y2JdCqcvyqJZzjG4XRWodlvwR73RTL
|
||||
sender_localpart: fqdcOOEFXg119Er1ZGhybnolo0G2qWaR
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ appservice:
|
|||
# Like the homeserver address, a local non-https address is recommended when the bridge is on the same machine.
|
||||
# If the bridge is elsewhere, you must secure the connection yourself (e.g. with https or wireguard)
|
||||
# If you want to use https, you need to use a reverse proxy. The bridge does not have TLS support built in.
|
||||
address: http://mautrix-slack:29335
|
||||
address: http://as-mautrix-slack:29335
|
||||
# A public address that external services can use to reach this appservice.
|
||||
# This is only needed for things like public media. A reverse proxy is generally necessary when using this field.
|
||||
# This value doesn't affect the registration file.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
id: slack
|
||||
url: http://mautrix-slack:29335
|
||||
url: http://as-mautrix-slack:29335
|
||||
as_token: hKvxR9H2FUQusZY5Ug7JWtrOqugLLU3m8kIQnGApTTIYGTbIvKNOS0bFv1BAAtwg
|
||||
hs_token: SptrHkculXlvYvMUHwv1Tmr7TxnfD9RY6NKM89mTXgdMkgKC6j9WdlDOUWvxuTd5
|
||||
sender_localpart: BPv5f9VoCPflaOvndjDnG56dgLLeTq7g
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ appservice:
|
|||
# Like the homeserver address, a local non-https address is recommended when the bridge is on the same machine.
|
||||
# If the bridge is elsewhere, you must secure the connection yourself (e.g. with https or wireguard)
|
||||
# If you want to use https, you need to use a reverse proxy. The bridge does not have TLS support built in.
|
||||
address: http://mautrix-whatsapp:29318
|
||||
address: http://as-mautrix-whatsapp:29318
|
||||
# A public address that external services can use to reach this appservice.
|
||||
# This is only needed for things like public media. A reverse proxy is generally necessary when using this field.
|
||||
# This value doesn't affect the registration file.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
id: whatsapp
|
||||
url: http://mautrix-whatsapp:29318
|
||||
url: http://as-mautrix-whatsapp:29318
|
||||
as_token: zmjejOVmK9RYLZ8fSUshhq8WmX3D0C3oYT0Z1fEWjnGFmm6dl8XSRcwujVMyknj0
|
||||
hs_token: zxTT6FG5qL8igfSzubyoL5XU2pSSpaIKAGglXCEdGLQ5aCQrDxsWsV8otyOXDtFY
|
||||
sender_localpart: 6FrdNTxqe5cu5653vU9OoOf4hwxG9FUC
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue