Merge branch '520-documentation' into 'develop'

Resolve "Envsubst : too many arguments when installing"

Closes #520

See merge request funkwhale/funkwhale!401
merge-requests/403/head
Eliot Berriot 2018-09-08 17:54:55 +00:00
commit bbf0f4a1ef
4 zmienionych plików z 5 dodań i 4 usunięć

Wyświetl plik

@ -0,0 +1 @@
Fixed wrong env file URL and display bugs in deployment documentation (#520)

Wyświetl plik

@ -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::

Wyświetl plik

@ -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)

Wyświetl plik

@ -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"