From 333b8417d234c250d056394f0434bcbffa46a80c Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 22 Sep 2018 13:40:13 +0200
Subject: [PATCH] Fixed #537: wrong URLs for docker / nginx files in
documentation
---
changes/changelog.d/537.doc | 1 +
docs/installation/docker.rst | 6 +++---
docs/installation/index.rst | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 changes/changelog.d/537.doc
diff --git a/changes/changelog.d/537.doc b/changes/changelog.d/537.doc
new file mode 100644
index 0000000000..f7bdad1308
--- /dev/null
+++ b/changes/changelog.d/537.doc
@@ -0,0 +1 @@
+Fixed wrong URLs for docker / nginx files in documentation (#537)
diff --git a/docs/installation/docker.rst b/docs/installation/docker.rst
index 31095e5725..8b594eaa36 100644
--- a/docs/installation/docker.rst
+++ b/docs/installation/docker.rst
@@ -11,9 +11,9 @@ Download the sample docker-compose file:
cd /srv/funkwhale
mkdir nginx
- curl -L -o nginx/funkwhale.template "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/deploy/docker.nginx.template"
- curl -L -o nginx/funkwhale_proxy.conf "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/deploy/funkwhale_proxy.conf"
- curl -L -o docker-compose.yml "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/deploy/docker-compose.yml"
+ curl -L -o nginx/funkwhale.template "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/docker.nginx.template"
+ curl -L -o nginx/funkwhale_proxy.conf "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/funkwhale_proxy.conf"
+ curl -L -o docker-compose.yml "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/docker-compose.yml"
Create your env file:
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index c9977a7d4d..9c7a279ed3 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -138,7 +138,7 @@ On non-docker deployments, run the following commands:
# download the needed files
curl -L -o /etc/nginx/funkwhale_proxy.conf "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/funkwhale_proxy.conf"
- curl -L -o /etc/nginx/sites-available/funkwhale.template "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/docker.proxy.template"
+ curl -L -o /etc/nginx/sites-available/funkwhale.template "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/nginx.template"
# create a final nginx configuration using the template based on your environment
set -a && source /srv/funkwhale/config/.env && set +a
--
GitLab