MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #642: Deploy documentation from the master branch instead of the develop branch to avoid inconsistencies

This commit is contained in:
Eliot Berriot 2018-12-19 10:21:27 +01:00
parent ad5fa9dfe1
commit f4b7dd6518
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -230,7 +230,7 @@ pages:
paths: paths:
- public - public
only: only:
- develop@funkwhale/funkwhale - master@funkwhale/funkwhale
tags: tags:
- docker - docker

1
changes/changelog.d/642.documentation Normal file
View File

@ -0,0 +1 @@
Deploy documentation from the master branch instead of the develop branch to avoid inconsistencies (#642)

2
docs/installation/debian.rst
View File

@ -211,7 +211,7 @@ Download the sample environment file:
.. parsed-literal:: .. parsed-literal::
curl -L -o config/.env "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/env.prod.sample" curl -L -o config/.env "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/master/deploy/env.prod.sample"
# symlink it so it's sourced automatically by the API process # symlink it so it's sourced automatically by the API process
# (This won't be needed anymore once release 0.18 is out) # (This won't be needed anymore once release 0.18 is out)
ln -s /srv/funkwhale/config/.env /srv/funkwhale/api/.env ln -s /srv/funkwhale/config/.env /srv/funkwhale/api/.env

8
docs/installation/docker.rst
View File

@ -12,9 +12,9 @@ Download the sample docker-compose file:
mkdir /srv/funkwhale mkdir /srv/funkwhale
cd /srv/funkwhale cd /srv/funkwhale
mkdir nginx mkdir nginx
curl -L -o nginx/funkwhale.template "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/docker.nginx.template" curl -L -o nginx/funkwhale.template "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/master/deploy/docker.nginx.template"
curl -L -o nginx/funkwhale_proxy.conf "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/funkwhale_proxy.conf" curl -L -o nginx/funkwhale_proxy.conf "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/master/deploy/funkwhale_proxy.conf"
curl -L -o docker-compose.yml "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/docker-compose.yml" curl -L -o docker-compose.yml "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/master/deploy/docker-compose.yml"
At this point, the archticture of ``/srv/funkwhale`` should look like that: At this point, the archticture of ``/srv/funkwhale`` should look like that:
@ -32,7 +32,7 @@ Create your env file:
.. parsed-literal:: .. parsed-literal::
export FUNKWHALE_VERSION="|version|" export FUNKWHALE_VERSION="|version|"
curl -L -o .env "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/env.prod.sample" curl -L -o .env "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/master/deploy/env.prod.sample"
sed -i "s/FUNKWHALE_VERSION=latest/FUNKWHALE_VERSION=$FUNKWHALE_VERSION/" .env sed -i "s/FUNKWHALE_VERSION=latest/FUNKWHALE_VERSION=$FUNKWHALE_VERSION/" .env
sudo nano .env sudo nano .env

8
docs/installation/index.rst
View File

@ -148,8 +148,8 @@ On docker deployments, run the following commands:
.. code:: shell .. code:: shell
# download the needed files # download the needed files
curl -L -o /etc/nginx/funkwhale_proxy.conf "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/funkwhale_proxy.conf" curl -L -o /etc/nginx/funkwhale_proxy.conf "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/master/deploy/funkwhale_proxy.conf"
curl -L -o /etc/nginx/sites-available/funkwhale.template "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/docker.proxy.template" curl -L -o /etc/nginx/sites-available/funkwhale.template "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/master/deploy/docker.proxy.template"
# create a final nginx configuration using the template based on your environment # create a final nginx configuration using the template based on your environment
set -a && source /srv/funkwhale/.env && set +a set -a && source /srv/funkwhale/.env && set +a
@ -164,8 +164,8 @@ On non-docker deployments, run the following commands:
.. code:: shell .. code:: shell
# download the needed files # download the needed files
curl -L -o /etc/nginx/funkwhale_proxy.conf "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/funkwhale_proxy.conf" curl -L -o /etc/nginx/funkwhale_proxy.conf "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/master/deploy/funkwhale_proxy.conf"
curl -L -o /etc/nginx/sites-available/funkwhale.template "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/nginx.template" curl -L -o /etc/nginx/sites-available/funkwhale.template "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/master/deploy/nginx.template"
# create a final nginx configuration using the template based on your environment # create a final nginx configuration using the template based on your environment
set -a && source /srv/funkwhale/config/.env && set +a set -a && source /srv/funkwhale/config/.env && set +a