matrix: working federation
This commit is contained in:
parent
4a98169d89
commit
b94a0d7177
5 changed files with 11 additions and 15 deletions
|
@ -417,17 +417,17 @@ acme:
|
||||||
# Port number to listen on for the HTTP-01 challenge. Change this if
|
# Port number to listen on for the HTTP-01 challenge. Change this if
|
||||||
# you are forwarding connections through Apache/Nginx/etc.
|
# you are forwarding connections through Apache/Nginx/etc.
|
||||||
#
|
#
|
||||||
port: 80
|
# port: 80
|
||||||
|
|
||||||
# Local addresses to listen on for incoming connections.
|
# Local addresses to listen on for incoming connections.
|
||||||
# Again, you may want to change this if you are forwarding connections
|
# Again, you may want to change this if you are forwarding connections
|
||||||
# through Apache/Nginx/etc.
|
# through Apache/Nginx/etc.
|
||||||
#
|
#
|
||||||
bind_addresses: ['::', '0.0.0.0']
|
# bind_addresses: ['::', '0.0.0.0']
|
||||||
|
|
||||||
# How many days remaining on a certificate before it is renewed.
|
# How many days remaining on a certificate before it is renewed.
|
||||||
#
|
#
|
||||||
reprovision_threshold: 30
|
# reprovision_threshold: 30
|
||||||
|
|
||||||
# The domain that the certificate should be for. Normally this
|
# The domain that the certificate should be for. Normally this
|
||||||
# should be the same as your Matrix domain (i.e., 'server_name'), but,
|
# should be the same as your Matrix domain (i.e., 'server_name'), but,
|
||||||
|
@ -441,14 +441,14 @@ acme:
|
||||||
#
|
#
|
||||||
# If not set, defaults to your 'server_name'.
|
# If not set, defaults to your 'server_name'.
|
||||||
#
|
#
|
||||||
domain: matrix.example.com
|
# domain: matrix.example.com
|
||||||
|
|
||||||
# file to use for the account key. This will be generated if it doesn't
|
# file to use for the account key. This will be generated if it doesn't
|
||||||
# exist.
|
# exist.
|
||||||
#
|
#
|
||||||
# If unspecified, we will use CONFDIR/client.key.
|
# If unspecified, we will use CONFDIR/client.key.
|
||||||
#
|
#
|
||||||
account_key_file: /data/acme_account.key
|
# account_key_file: /data/acme_account.key
|
||||||
|
|
||||||
# List of allowed TLS fingerprints for this server to publish along
|
# List of allowed TLS fingerprints for this server to publish along
|
||||||
# with the signing keys for this server. Other matrix servers that
|
# with the signing keys for this server. Other matrix servers that
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
version: '3.7'
|
version: '3.7'
|
||||||
|
|
||||||
|
# https://github.com/matrix-org/synapse/tree/master/docs
|
||||||
# https://github.com/matrix-org/synapse/tree/master/contrib/docker
|
# https://github.com/matrix-org/synapse/tree/master/contrib/docker
|
||||||
# https://github.com/matrix-org/synapse/blob/master/docs/reverse_proxy.md
|
# https://github.com/matrix-org/synapse/blob/master/docs/reverse_proxy.md
|
||||||
# https://github.com/matrix-org/synapse/blob/master/docs/federate.md
|
# https://github.com/matrix-org/synapse/blob/master/docs/federate.md
|
||||||
# https://github.com/matrix-org/synapse/blob/master/docs/postgres.md
|
# https://github.com/matrix-org/synapse/blob/master/docs/postgres.md
|
||||||
|
# https://github.com/matrix-org/synapse/blob/master/debian/register_new_matrix_user.ronn
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
matrix:
|
matrix:
|
||||||
|
|
|
@ -4,10 +4,6 @@ http://autoconfig.{$BASE_DOMAIN} {
|
||||||
root /srv/autoconfig
|
root /srv/autoconfig
|
||||||
}
|
}
|
||||||
|
|
||||||
# http://*.{$BASE_DOMAIN} {
|
|
||||||
# redir https://{host}{uri}
|
|
||||||
# }
|
|
||||||
|
|
||||||
https://{$BASE_DOMAIN} {
|
https://{$BASE_DOMAIN} {
|
||||||
import config/common
|
import config/common
|
||||||
root /srv/homepage
|
root /srv/homepage
|
||||||
|
@ -25,9 +21,8 @@ https://{$BASE_DOMAIN} {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
http://{$BASE_DOMAIN}:8448 {
|
https://{$BASE_DOMAIN}:8448 {
|
||||||
log / stdout "{host} - {common}"
|
import config/common
|
||||||
errors stdout
|
|
||||||
proxy / matrix:8008 {
|
proxy / matrix:8008 {
|
||||||
transparent
|
transparent
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
log / stdout "{host} - {common}"
|
log / stdout "{host} - {common}"
|
||||||
errors stdout
|
errors stdout
|
||||||
tls {$TLS_EMAIL} {
|
tls {$TLS_EMAIL}
|
||||||
ca {$CA_URL}
|
|
||||||
}
|
|
||||||
gzip
|
gzip
|
||||||
|
|
|
@ -21,6 +21,7 @@ services:
|
||||||
ports:
|
ports:
|
||||||
- '80:80'
|
- '80:80'
|
||||||
- '443:443'
|
- '443:443'
|
||||||
|
- '8448:8448'
|
||||||
volumes:
|
volumes:
|
||||||
- ./proxy/Caddyfile:/etc/Caddyfile:ro
|
- ./proxy/Caddyfile:/etc/Caddyfile:ro
|
||||||
- ./proxy/config:/etc/config:ro
|
- ./proxy/config:/etc/config:ro
|
||||||
|
|
Loading…
Reference in a new issue