Merge branch 'add_ssl_to_apache_config' into 'next'

Update file DEPLOY.md to add SSL configuration to Apache config

See merge request famedly/conduit!594

docs/deploying/generic.md

@@ -160,6 +160,10 @@ Listen 8448
 
 ServerName your.server.name # EDIT THIS
 
+SSLEngine on 
+SSLCertificateFile /etc/letsencrypt/live/your.server.name/fullchain.pem # EDIT THIS
+SSLCertificateKeyFile /etc/letsencrypt/live/your.server.name/privkey.pem # EDIT THIS
+
 AllowEncodedSlashes NoDecode
 ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ timeout=300 nocanon
 ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/