diff --git a/changes/changelog.d/537.doc b/changes/changelog.d/537.doc new file mode 100644 index 0000000000000000000000000000000000000000..f7bdad1308bf88c9faea6d329ab4cc38ea7834c6 --- /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 31095e572566f7db4f84174e15bdcb5ddb9a957c..8b594eaa3695dda0f26a4d270d31c169419b346b 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 c9977a7d4d7dfd6e5be75a4ee9e9eba98b2dfa47..9c7a279ed383dc713a83f76f37dc0230c8a576a4 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