From 1a637fca85c606931df9628e5b9c16453a0b747d Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 8 Sep 2018 19:48:34 +0200
Subject: [PATCH] Fixed #520: wrong env file URL and display bugs in deployment
documentation
---
changes/changelog.d/520.bugfix | 1 +
docs/installation/debian.rst | 2 +-
docs/installation/docker.rst | 2 +-
docs/installation/index.rst | 4 ++--
4 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 changes/changelog.d/520.bugfix
diff --git a/changes/changelog.d/520.bugfix b/changes/changelog.d/520.bugfix
new file mode 100644
index 00000000..3cd146d2
--- /dev/null
+++ b/changes/changelog.d/520.bugfix
@@ -0,0 +1 @@
+Fixed wrong env file URL and display bugs in deployment documentation (#520)
diff --git a/docs/installation/debian.rst b/docs/installation/debian.rst
index 407f71dd..08678b58 100644
--- a/docs/installation/debian.rst
+++ b/docs/installation/debian.rst
@@ -207,7 +207,7 @@ Download the sample environment file:
.. parsed-literal::
- curl -L -o config/.env "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/deploy/env.prod.sample"
+ curl -L -o config/.env "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/env.prod.sample"
.. note::
diff --git a/docs/installation/docker.rst b/docs/installation/docker.rst
index fc13851c..31095e57 100644
--- a/docs/installation/docker.rst
+++ b/docs/installation/docker.rst
@@ -20,7 +20,7 @@ Create your env file:
.. parsed-literal::
export FUNKWHALE_VERSION="|version|"
- curl -L -o .env "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/deploy/env.prod.sample"
+ curl -L -o .env "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/env.prod.sample"
sed -i "s/FUNKWHALE_VERSION=latest/FUNKWHALE_VERSION=$FUNKWHALE_VERSION/" .env
Ensure to edit it to match your needs (this file is heavily commented)
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index d714ff51..c9977a7d 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -120,7 +120,7 @@ match the application configuration and make upgrade/maintenance easier.
On docker deployments, run the following commands:
-.. parsed-literal::
+.. code:: shell
# download the needed files
curl -L -o /etc/nginx/funkwhale_proxy.conf "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/funkwhale_proxy.conf"
@@ -134,7 +134,7 @@ On docker deployments, run the following commands:
On non-docker deployments, run the following commands:
-.. parsed-literal::
+.. code:: shell
# download the needed files
curl -L -o /etc/nginx/funkwhale_proxy.conf "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/funkwhale_proxy.conf"
--
GitLab