From 0695647713c901eed6e64a4e17fc3e55cd6d8273 Mon Sep 17 00:00:00 2001
From: gisforgabriel <mr.gabriel.morrison+github@gmail.com>
Date: Thu, 11 Jun 2020 05:45:10 +0200
Subject: [PATCH] Docs - Reverse proxy - Caddy v2 installation notes
---
changes/changelog.d/1137.docs | 1 +
docs/installation/index.rst | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 changes/changelog.d/1137.docs
diff --git a/changes/changelog.d/1137.docs b/changes/changelog.d/1137.docs
new file mode 100644
index 0000000000..9a4ae4d19e
--- /dev/null
+++ b/changes/changelog.d/1137.docs
@@ -0,0 +1 @@
+Updated documentation to reflect changes in Caddy v2.
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index 1fd338976b..08f521781b 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -324,7 +324,15 @@ Caddy
^^^^^
If you're using Caddy as a reverse proxy in front of your docker containers (either mono or multi-container setup),
-you can use the following configuration::
+you can use the following Caddyfile configuration:
+
+Caddy v2::
+
+ yourdomain.funkwhale
+
+ reverse_proxy 127.0.0.1:5000
+
+Caddy v1::
yourdomain.funkwhale {
proxy / 127.0.0.1:5000 {
@@ -335,7 +343,6 @@ you can use the following configuration::
}
-
About internal locations
^^^^^^^^^^^^^^^^^^^^^^^^
--
GitLab