From ddf5e6254a4e7099ba965de0e79dbd74e51c143d Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Fri, 21 Jun 2019 05:46:21 +0300
Subject: Fix nginx webroot method config

---
 installation/pleroma.nginx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'installation')

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 7425da33f..7fc4aeea5 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -14,7 +14,6 @@ server {
 
     listen         80;
     listen         [::]:80;
-    return         301 https://$server_name$request_uri;
 
     # Uncomment this if you need to use the 'webroot' method with certbot. Make sure
     # that the directory exists and that it is accessible by the webserver. If you followed
@@ -23,8 +22,11 @@ server {
     # to get the certificate, and then uncomment it.
     #
     # location ~ /\.well-known/acme-challenge {
-    #     root /var/lib/letsencrypt/.well-known/acme-challenge;
+    #     alias /var/lib/letsencrypt/.well-known/acme-challenge;
     # }
+    location / {
+      return         301 https://$server_name$request_uri;
+    }
 }
 
 # Enable SSL session caching for improved performance
-- 
cgit v1.2.3


From c013d3f3c89a638e20e786a528be598cfa225af7 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sat, 22 Jun 2019 20:26:59 +0300
Subject: Fix the webroot method in the nginx config

---
 installation/pleroma.nginx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'installation')

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 7fc4aeea5..de380a6ca 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -22,7 +22,7 @@ server {
     # to get the certificate, and then uncomment it.
     #
     # location ~ /\.well-known/acme-challenge {
-    #     alias /var/lib/letsencrypt/.well-known/acme-challenge;
+    #     root /var/lib/letsencrypt/;
     # }
     location / {
       return         301 https://$server_name$request_uri;
-- 
cgit v1.2.3


From 997e766929172eddade2416c9e915806a402a8d1 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sun, 23 Jun 2019 07:39:23 +0300
Subject: Remove sudo in the nginx config command example

---
 installation/pleroma.nginx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'installation')

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index de380a6ca..e3c70de54 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -17,7 +17,7 @@ server {
 
     # Uncomment this if you need to use the 'webroot' method with certbot. Make sure
     # 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.
+    # the guide, you already ran '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.
     #
-- 
cgit v1.2.3