From 9b69ccb35b8521efa58d40931b9a83266ad2f686 Mon Sep 17 00:00:00 2001
From: sleepycrow <sleepycrow@posteo.net>
Date: Sun, 6 Mar 2022 14:24:32 +0100
Subject: Update Caddyfile to Caddy v2

---
 installation/caddyfile-pleroma.example | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

(limited to 'installation')

diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example
index 7985d9c67..cc7dda011 100644
--- a/installation/caddyfile-pleroma.example
+++ b/installation/caddyfile-pleroma.example
@@ -5,34 +5,13 @@
 # 2. Copy this section into your Caddyfile and restart Caddy.
 
 example.tld  {
-  log /var/log/caddy/pleroma_access.log
-  errors /var/log/caddy/pleroma_error.log
+  log {
+    output file /var/log/caddy/pleroma.log
+  }
 
-  gzip
+  encode gzip
 
   # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
   # and `localhost.` resolves to [::0] on some systems: see issue #930
-  proxy / 127.0.0.1:4000 {
-    websocket
-    transparent
-  }
-
-  tls {
-    # Remove the rest of the lines in here, if you want to support older devices
-    key_type p256
-    ciphers ECDHE-ECDSA-WITH-CHACHA20-POLY1305 ECDHE-RSA-WITH-CHACHA20-POLY1305 ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-GCM-SHA256
-  }
-
-  # If you do not want to use the mediaproxy function, remove these lines.
-  # To use this directive, you need the http.cache plugin for Caddy.
-  cache {
-    match_path /media
-    default_max_age 720m
-  }
-
-  cache {
-    match_path /proxy
-    default_max_age 720m
-  }
-  # Stop removing lines here.
+  reverse_proxy 127.0.0.1:4000
 }
-- 
cgit v1.2.3


From 64e16e6a4be83e9328d62101cc21d10cf07e38fb Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sat, 16 Jul 2022 23:44:37 -0600
Subject: Document way to do notice compatibility routes with Nginx
 reverse-proxy instead

---
 installation/pleroma.nginx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'installation')

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 9890cb2b1..8aed2daea 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -81,6 +81,19 @@ server {
         proxy_pass http://phoenix;
     }
 
+    # Uncomment this if you want notice compatibility routes for frontends like Soapbox.
+    # location ~ /@.+/([^/]+) {
+    #     proxy_pass http://phoenix/notice/$1;
+    # }
+    #
+    # location ~ /@.+/posts/([^/]+) {
+    #     proxy_pass http://phoenix/notice/$1;
+    # }
+    #
+    # location ~ /.+/status/([^/]+) {
+    #     proxy_pass http://phoenix/notice/$1;
+    # }
+
     location ~ ^/(media|proxy) {
         proxy_cache        pleroma_media_cache;
         slice              1m;
-- 
cgit v1.2.3


From 2c7eed122e909f392e3d41efe43fc2b0b99fe842 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sun, 17 Jul 2022 12:50:01 -0600
Subject: Don't accept forward slash character for nicknames

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

(limited to 'installation')

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 8aed2daea..d53852984 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -82,15 +82,15 @@ server {
     }
 
     # Uncomment this if you want notice compatibility routes for frontends like Soapbox.
-    # location ~ /@.+/([^/]+) {
+    # location ~ /@([^/]+)/([^/]+) {
     #     proxy_pass http://phoenix/notice/$1;
     # }
     #
-    # location ~ /@.+/posts/([^/]+) {
+    # location ~ /@([^/]+)/posts/([^/]+) {
     #     proxy_pass http://phoenix/notice/$1;
     # }
     #
-    # location ~ /.+/status/([^/]+) {
+    # location ~ /([^/]+)/status/([^/]+) {
     #     proxy_pass http://phoenix/notice/$1;
     # }
 
-- 
cgit v1.2.3


From 3da1b2548dd5793fcf08050470252b9574991295 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Mon, 18 Jul 2022 21:30:57 -0600
Subject: Actually fix with forward slashes being restricted inside nickname

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

(limited to 'installation')

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index d53852984..273cfb390 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -82,15 +82,15 @@ server {
     }
 
     # Uncomment this if you want notice compatibility routes for frontends like Soapbox.
-    # location ~ /@([^/]+)/([^/]+) {
+    # location ~ ^/@[^/]+/([^/]+)$ {
     #     proxy_pass http://phoenix/notice/$1;
     # }
     #
-    # location ~ /@([^/]+)/posts/([^/]+) {
+    # location ~ ^/@[^/]+/posts/([^/]+)$ {
     #     proxy_pass http://phoenix/notice/$1;
     # }
     #
-    # location ~ /([^/]+)/status/([^/]+) {
+    # location ~ ^/[^/]+/status/([^/]+)$ {
     #     proxy_pass http://phoenix/notice/$1;
     # }
 
-- 
cgit v1.2.3