diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-17 14:07:04 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-17 14:07:04 +0300 |
commit | bc4f77b10bb4360ac00d1999b1d08fa55e1fa547 (patch) | |
tree | 8c87c2cefd1e325a64a19c04d7d7d70ffd8cc485 /installation/pleroma.nginx | |
parent | dcf24a3233bb50689d26f9d7833f98158730ce35 (diff) | |
parent | 3b141194715e362d65482672d00b10991d102fa2 (diff) | |
download | pleroma-bc4f77b10bb4360ac00d1999b1d08fa55e1fa547.tar.gz |
[#468] Merged `upstream/develop`, resolved conflicts.
Diffstat (limited to 'installation/pleroma.nginx')
-rw-r--r-- | installation/pleroma.nginx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index a24bb0e61..a3d55e4bf 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -15,12 +15,13 @@ server { 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. + # that the directory exists and that it is accessible by the webserver. If you followed + # the guide, you already ran 'sudo mkdir -p /var/lib/letsencrypt' to create the folder. + # 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/; + # root /var/lib/letsencrypt/.well-known/acme-challenge; # } } |