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

apache2 sample-config error

See merge request famedly/conduit!191
merge-requests/192/merge
Timo Kösters 3 years ago
commit 0737bc021f

@ -162,9 +162,6 @@ AllowEncodedSlashes NoDecode
ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ nocanon
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>
```

Loading…
Cancel
Save