Merge branch 'master-to-develop' into 'develop'

Master to develop

Closes #575, #626, and #642

See merge request funkwhale/funkwhale!495

.gitlab-ci.yml

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

CONTRIBUTING.rst

@@ -31,7 +31,7 @@ Setup front-end only development environment
 
 1. Clone the repository::
 
-    git clone ssh://git@dev.funkwhale.audio:2222/funkwhale/funkwhale.git
+    git clone ssh://git@dev.funkwhale.audio/funkwhale/funkwhale.git
     cd funkwhale
     cd front
 

changes/changelog.d/642.documentation

+Deploy documentation from the master branch instead of the develop branch to avoid inconsistencies (#642)

docs/installation/debian.rst

@@ -114,9 +114,7 @@ Then we'll download the frontend files:
         cd /srv
 
         rm -r funkwhale
-
         git clone -b master https://dev.funkwhale.audio/funkwhale/funkwhale funkwhale
-
         cd funkwhale
 
     The above clone command uses the master branch instead of the default develop branch, as master is stable and more suited for production setups.
@@ -212,7 +210,7 @@ Download the sample environment file:
 
 .. 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
     # (This won't be needed anymore once release 0.18 is out)
     ln -s /srv/funkwhale/config/.env /srv/funkwhale/api/.env

docs/installation/docker.rst

@@ -12,9 +12,9 @@ Download the sample docker-compose file:
     mkdir /srv/funkwhale
     cd /srv/funkwhale
     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_proxy.conf "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/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 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/master/deploy/funkwhale_proxy.conf"
+    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:
 
@@ -32,7 +32,7 @@ Create your env file:
 .. parsed-literal::
 
     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
     sudo nano .env
 

docs/installation/index.rst

@@ -148,8 +148,8 @@ On docker deployments, run the following commands:
 .. code:: shell
 
     # 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/sites-available/funkwhale.template "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/docker.proxy.template"
+    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/master/deploy/docker.proxy.template"
 
     # create a final nginx configuration using the template based on your environment
     set -a && source /srv/funkwhale/.env && set +a
@@ -164,8 +164,8 @@ On non-docker deployments, run the following commands:
 .. code:: shell
 
     # 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/sites-available/funkwhale.template "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/nginx.template"
+    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/master/deploy/nginx.template"
 
     # create a final nginx configuration using the template based on your environment
     set -a && source /srv/funkwhale/config/.env && set +a