Merge branch 'charludo-next-patch-31617' into 'next'

apache2 sample-config error

See merge request famedly/conduit!191
next
Timo Kösters 2021-09-06 18:38:38 +00:00
commit 0737bc021f
1 changed files with 0 additions and 3 deletions

View File

@ -162,9 +162,6 @@ AllowEncodedSlashes NoDecode
ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ nocanon ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ nocanon
ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/ ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/
Include /etc/letsencrypt/options-ssl-apache.conf
SSLCertificateFile /etc/letsencrypt/live/your.server.name/fullchain.pem # EDIT THIS
SSLCertificateKeyFile /etc/letsencrypt/live/your.server.name/privkey.pem # EDIT THIS
</VirtualHost> </VirtualHost>
``` ```