X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=doc%2Fmd%2FReverse-proxy.md;h=77e4a04d7e12f11da847d0419b65e601ab57a5a5;hb=083b28021a34120778c203c85be6461a426cfa44;hp=2c1c601e8edadd8587bc69d3348784cbbb6a7f45;hpb=91a21c272960889afd4eaa431a3d29b7785b6efc;p=github%2Fshaarli%2FShaarli.git
diff --git a/doc/md/Reverse-proxy.md b/doc/md/Reverse-proxy.md
index 2c1c601e..77e4a04d 100644
--- a/doc/md/Reverse-proxy.md
+++ b/doc/md/Reverse-proxy.md
@@ -17,8 +17,17 @@ See also [proxy-related](https://github.com/shaarli/Shaarli/issues?utf8=%E2%9C%9
```apache
ServerName shaarli.mydomain.org
- # Redirect HTTP to HTTPS
- Redirect permanent / https://shaarli.mydomain.org
+ DocumentRoot /var/www/shaarli.mydomain.org/
+
+ # Redirect HTTP requests to HTTPS, except Let's Encrypt ACME challenge requests
+ RewriteEngine on
+ RewriteRule ^.well-known/acme-challenge/ - [L]
+ RewriteCond %{HTTP_HOST} =shaarli.mydomain.org
+ RewriteRule ^ https://shaarli.mydomain.org%{REQUEST_URI} [END,NE,R=permanent]
+ # If you are using mod_md, use this instead
+ #MDCertificateAgreement accepted
+ #MDContactEmail admin@shaarli.mydomain.org
+ #MDPrivateKeys RSA 4096
@@ -28,10 +37,6 @@ See also [proxy-related](https://github.com/shaarli/Shaarli/issues?utf8=%E2%9C%9
SSLCertificateFile /path/to/certificate
SSLCertificateKeyFile /path/to/private/key
- LogLevel warn
- ErrorLog /var/log/apache2/error.log
- CustomLog /var/log/apache2/access.log combined
-
# let the proxied shaarli server/container know HTTPS URLs should be served
RequestHeader set X-Forwarded-Proto "https"