@@ -552,13 +552,9 @@ retention:
552552# This certificate, as of Synapse 1.0, will need to be a valid and verifiable
553553# certificate, signed by a recognised Certificate Authority.
554554#
555- # See 'ACME support' below to enable auto-provisioning this certificate via
556- # Let's Encrypt.
557- #
558- # If supplying your own, be sure to use a `.pem` file that includes the
559- # full certificate chain including any intermediate certificates (for
560- # instance, if using certbot, use `fullchain.pem` as your certificate,
561- # not `cert.pem`).
555+ # Be sure to use a `.pem` file that includes the full certificate chain including
556+ # any intermediate certificates (for instance, if using certbot, use
557+ # `fullchain.pem` as your certificate, not `cert.pem`).
562558#
563559# tls_certificate_path: "CONFDIR/SERVERNAME.tls.crt"
564560
@@ -609,80 +605,6 @@ retention:
609605# - myCA2.pem
610606# - myCA3.pem
611607
612- # ACME support: This will configure Synapse to request a valid TLS certificate
613- # for your configured `server_name` via Let's Encrypt.
614- #
615- # Note that ACME v1 is now deprecated, and Synapse currently doesn't support
616- # ACME v2. This means that this feature currently won't work with installs set
617- # up after November 2019. For more info, and alternative solutions, see
618- # https://github.com/matrix-org/synapse/blob/master/docs/ACME.md#deprecation-of-acme-v1
619- #
620- # Note that provisioning a certificate in this way requires port 80 to be
621- # routed to Synapse so that it can complete the http-01 ACME challenge.
622- # By default, if you enable ACME support, Synapse will attempt to listen on
623- # port 80 for incoming http-01 challenges - however, this will likely fail
624- # with 'Permission denied' or a similar error.
625- #
626- # There are a couple of potential solutions to this:
627- #
628- # * If you already have an Apache, Nginx, or similar listening on port 80,
629- # you can configure Synapse to use an alternate port, and have your web
630- # server forward the requests. For example, assuming you set 'port: 8009'
631- # below, on Apache, you would write:
632- #
633- # ProxyPass /.well-known/acme-challenge http://localhost:8009/.well-known/acme-challenge
634- #
635- # * Alternatively, you can use something like `authbind` to give Synapse
636- # permission to listen on port 80.
637- #
638- acme :
639- # ACME support is disabled by default. Set this to `true` and uncomment
640- # tls_certificate_path and tls_private_key_path above to enable it.
641- #
642- enabled : false
643-
644- # Endpoint to use to request certificates. If you only want to test,
645- # use Let's Encrypt's staging url:
646- # https://acme-staging.api.letsencrypt.org/directory
647- #
648- # url: https://acme-v01.api.letsencrypt.org/directory
649-
650- # Port number to listen on for the HTTP-01 challenge. Change this if
651- # you are forwarding connections through Apache/Nginx/etc.
652- #
653- port : 80
654-
655- # Local addresses to listen on for incoming connections.
656- # Again, you may want to change this if you are forwarding connections
657- # through Apache/Nginx/etc.
658- #
659- bind_addresses : ['::', '0.0.0.0']
660-
661- # How many days remaining on a certificate before it is renewed.
662- #
663- reprovision_threshold : 30
664-
665- # The domain that the certificate should be for. Normally this
666- # should be the same as your Matrix domain (i.e., 'server_name'), but,
667- # by putting a file at 'https://<server_name>/.well-known/matrix/server',
668- # you can delegate incoming traffic to another server. If you do that,
669- # you should give the target of the delegation here.
670- #
671- # For example: if your 'server_name' is 'example.com', but
672- # 'https://example.com/.well-known/matrix/server' delegates to
673- # 'matrix.example.com', you should put 'matrix.example.com' here.
674- #
675- # If not set, defaults to your 'server_name'.
676- #
677- domain : matrix.example.com
678-
679- # file to use for the account key. This will be generated if it doesn't
680- # exist.
681- #
682- # If unspecified, we will use CONFDIR/client.key.
683- #
684- account_key_file : DATADIR/acme_account.key
685-
686608
687609# # Federation ##
688610
0 commit comments