diff options
| author | Francis Dinh <normandy@firemail.cc> | 2018-04-25 00:46:28 -0400 |
|---|---|---|
| committer | Francis Dinh <normandy@firemail.cc> | 2018-04-25 00:46:28 -0400 |
| commit | 9e0dd21ed637ec7b884570b2ad8705b5fac72580 (patch) | |
| tree | 6efae2883556ee499dcefb0083412701b501f3e8 /installation | |
| parent | 0df1a4efc841af4a12f45c1551f372d867ff7e1d (diff) | |
| parent | d4a54a90c9ae39947c71876d4d2988a05a02d7a1 (diff) | |
| download | pleroma-9e0dd21ed637ec7b884570b2ad8705b5fac72580.tar.gz pleroma-9e0dd21ed637ec7b884570b2ad8705b5fac72580.zip | |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/pleroma.nginx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index 61e40c508..895799a8e 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -4,7 +4,7 @@ # 1. Install your TLS certificate, possibly using Let's Encrypt. # 2. Replace 'example.tld' with your instance's domain wherever it appears. # 3. Copy this file to /etc/nginx/sites-available/ and then add a symlink to it -# in /etc/nginx/sites-enabled/ and restart nginx. +# in /etc/nginx/sites-enabled/ and run 'nginx -s reload' or restart nginx. proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cache:10m max_size=10g inactive=720m use_temp_path=off; @@ -13,6 +13,15 @@ server { listen 80; server_name example.tld; return 301 https://$server_name$request_uri; + + # Uncomment this if you need to use the 'webroot' method with certbot. Make sure + # that you also create the .well-known/acme-challenge directory structure in pleroma/priv/static and + # that is is accessible by the webserver. You may need to load this file with the ssl + # server block commented out, run certbot to get the certificate, and then uncomment it. + # + # location ~ /\.well-known/acme-challenge { + # root <path to install>/pleroma/priv/static/; + # } } server { |