kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
				
				
				
			Point to new gitlab URL
							rodzic
							
								
									fd1ce6ef51
								
							
						
					
					
						commit
						dd23dfa07c
					
				| 
						 | 
				
			
			@ -27,7 +27,7 @@ review_front:
 | 
			
		|||
    - yarn install
 | 
			
		||||
    - yarn run i18n-compile
 | 
			
		||||
    # this is to ensure we don't have any errors in the output,
 | 
			
		||||
    # cf https://code.eliotberriot.com/funkwhale/funkwhale/issues/169
 | 
			
		||||
    # cf https://dev.funkwhale.audio/funkwhale/funkwhale/issues/169
 | 
			
		||||
    - VUE_APP_INSTANCE_URL=$REVIEW_INSTANCE_URL yarn run build | tee /dev/stderr | (! grep -i 'ERROR in')
 | 
			
		||||
    - mkdir -p /static/front/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
 | 
			
		||||
    - cp -r dist/* /static/front/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
 | 
			
		||||
| 
						 | 
				
			
			@ -190,7 +190,7 @@ build_front:
 | 
			
		|||
    - yarn install
 | 
			
		||||
    - yarn run i18n-compile
 | 
			
		||||
    # this is to ensure we don't have any errors in the output,
 | 
			
		||||
    # cf https://code.eliotberriot.com/funkwhale/funkwhale/issues/169
 | 
			
		||||
    # cf https://dev.funkwhale.audio/funkwhale/funkwhale/issues/169
 | 
			
		||||
    - yarn build | tee /dev/stderr | (! grep -i 'ERROR in')
 | 
			
		||||
    - chmod -R 755 dist
 | 
			
		||||
  cache:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										10
									
								
								CHANGELOG
								
								
								
								
							
							
						
						
									
										10
									
								
								CHANGELOG
								
								
								
								
							| 
						 | 
				
			
			@ -4,7 +4,7 @@ Changelog
 | 
			
		|||
You can subscribe to release announcements by:
 | 
			
		||||
 | 
			
		||||
- Following `funkwhale@mastodon.eliotberriot.com <https://mastodon.eliotberriot.com/@funkwhale>`_ on Mastodon
 | 
			
		||||
- Subscribing to the following Atom feed: https://code.eliotberriot.com/funkwhale/funkwhale/commits/develop?format=atom&search=Merge+tag
 | 
			
		||||
- Subscribing to the following Atom feed: https://dev.funkwhale.audio/funkwhale/funkwhale/commits/develop?format=atom&search=Merge+tag
 | 
			
		||||
 | 
			
		||||
This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.html.
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -149,8 +149,8 @@ Download the required configuration files for the nginx container:
 | 
			
		|||
 | 
			
		||||
    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 nginx/funkwhale.template "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/|version|/deploy/docker.nginx.template"
 | 
			
		||||
    curl -L -o nginx/funkwhale_proxy.conf "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/|version|/deploy/funkwhale_proxy.conf"
 | 
			
		||||
 | 
			
		||||
Update the funkwhale.conf configuration of your server's reverse-proxy::
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -788,7 +788,7 @@ it to work Apache2, for instance. It was also not compatible with Subsonic clien
 | 
			
		|||
 | 
			
		||||
Based on that, we're currently removing support for transcoding
 | 
			
		||||
**in its current state**. The work on a better designed transcoding feature
 | 
			
		||||
can be tracked in https://code.eliotberriot.com/funkwhale/funkwhale/issues/272.
 | 
			
		||||
can be tracked in https://dev.funkwhale.audio/funkwhale/funkwhale/issues/272.
 | 
			
		||||
 | 
			
		||||
You don't have to do anything on your side, but you may want to remove
 | 
			
		||||
the now obsolete configuration from your reverse proxy file (nginx only)::
 | 
			
		||||
| 
						 | 
				
			
			@ -1562,7 +1562,7 @@ information periodically.
 | 
			
		|||
 | 
			
		||||
Celery beat can be enabled easily::
 | 
			
		||||
 | 
			
		||||
    curl -L -o "/etc/systemd/system/funkwhale-beat.service" "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/funkwhale-beat.service"
 | 
			
		||||
    curl -L -o "/etc/systemd/system/funkwhale-beat.service" "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/funkwhale-beat.service"
 | 
			
		||||
    # Also edit /etc/systemd/system/funkwhale.target
 | 
			
		||||
    # and ensure the Wants= line contains the following:
 | 
			
		||||
    # Wants=funkwhale-server.service funkwhale-worker.service funkwhale-beat.service
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -31,7 +31,7 @@ Setup front-end only development environment
 | 
			
		|||
 | 
			
		||||
1. Clone the repository::
 | 
			
		||||
 | 
			
		||||
    git clone ssh://git@code.eliotberriot.com:2222/funkwhale/funkwhale.git
 | 
			
		||||
    git clone ssh://git@dev.funkwhale.audio:2222/funkwhale/funkwhale.git
 | 
			
		||||
    cd funkwhale
 | 
			
		||||
    cd front
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -75,9 +75,9 @@ This is already cover in the relevant documentations:
 | 
			
		|||
Cloning the project
 | 
			
		||||
^^^^^^^^^^^^^^^^^^^
 | 
			
		||||
 | 
			
		||||
Visit https://code.eliotberriot.com/funkwhale/funkwhale and clone the repository using SSH or HTTPS. Exemple using SSH::
 | 
			
		||||
Visit https://dev.funkwhale.audio/funkwhale/funkwhale and clone the repository using SSH or HTTPS. Exemple using SSH::
 | 
			
		||||
 | 
			
		||||
    git clone ssh://git@code.eliotberriot.com:2222/funkwhale/funkwhale.git
 | 
			
		||||
    git clone ssh://git@dev.funkwhale.audio:2222/funkwhale/funkwhale.git
 | 
			
		||||
    cd funkwhale
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,7 @@ you found the proper place :)
 | 
			
		|||
 | 
			
		||||
Translation is done via our own Weblate instance at https://translate.funkwhale.audio/projects/funkwhale/front/.
 | 
			
		||||
 | 
			
		||||
You can signup/login using your Gitlab account (from https://code.eliotberriot.com).
 | 
			
		||||
You can signup/login using your Gitlab account (from https://dev.funkwhale.audio).
 | 
			
		||||
 | 
			
		||||
Translation workflow
 | 
			
		||||
--------------------
 | 
			
		||||
| 
						 | 
				
			
			@ -25,4 +25,4 @@ Requesting a new language
 | 
			
		|||
-------------------------
 | 
			
		||||
 | 
			
		||||
If you'd like to see a new language in Funkwhale, please open an issue here:
 | 
			
		||||
https://code.eliotberriot.com/funkwhale/funkwhale/issues
 | 
			
		||||
https://dev.funkwhale.audio/funkwhale/funkwhale/issues
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -143,7 +143,7 @@ class Command(BaseCommand):
 | 
			
		|||
        for m in raw_matching:
 | 
			
		||||
            # In some situations, the path is encoded incorrectly on the filesystem
 | 
			
		||||
            # so we filter out faulty paths and display a warning to the user.
 | 
			
		||||
            # see https://code.eliotberriot.com/funkwhale/funkwhale/issues/138
 | 
			
		||||
            # see https://dev.funkwhale.audio/funkwhale/funkwhale/issues/138
 | 
			
		||||
            try:
 | 
			
		||||
                m.encode("utf-8")
 | 
			
		||||
                matching.append(m)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,7 +11,7 @@ This setup requires Docker and docker-compose.
 | 
			
		|||
 | 
			
		||||
You can use your own music (put it in `/usr/share/music`, this is the directory the demo will look into by default).
 | 
			
		||||
 | 
			
		||||
If you don't have any music, you can use the repository https://code.eliotberriot.com/funkwhale/catalog, which
 | 
			
		||||
If you don't have any music, you can use the repository https://dev.funkwhale.audio/funkwhale/catalog, which
 | 
			
		||||
requires Git LFS.
 | 
			
		||||
 | 
			
		||||
## Create an env file
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,14 +10,14 @@ cd $demo_path
 | 
			
		|||
sudo rm -rf $demo_path/*
 | 
			
		||||
mkdir -p $demo_path
 | 
			
		||||
echo 'Downloading demo files...'
 | 
			
		||||
curl -L -o docker-compose.yml "https://code.eliotberriot.com/funkwhale/funkwhale/raw/$version/deploy/docker-compose.yml"
 | 
			
		||||
curl -L -o .env "https://code.eliotberriot.com/funkwhale/funkwhale/raw/$version/deploy/env.prod.sample"
 | 
			
		||||
curl -L -o docker-compose.yml "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/$version/deploy/docker-compose.yml"
 | 
			
		||||
curl -L -o .env "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/$version/deploy/env.prod.sample"
 | 
			
		||||
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 nginx/funkwhale.template "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/$version/deploy/docker.nginx.template"
 | 
			
		||||
curl -L -o nginx/funkwhale_proxy.conf "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/$version/deploy/funkwhale_proxy.conf"
 | 
			
		||||
 | 
			
		||||
mkdir data/
 | 
			
		||||
curl -L -o front.zip "https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/$version/download?job=build_front"
 | 
			
		||||
curl -L -o front.zip "https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/$version/download?job=build_front"
 | 
			
		||||
unzip front.zip
 | 
			
		||||
 | 
			
		||||
cat $env_file >> .env
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
# use this one if you put the nginx container behind another proxy
 | 
			
		||||
# you will have to set some headers on this proxy as well to ensure
 | 
			
		||||
# everything works correctly, you can use the ones from the funkwhale_proxy.conf file
 | 
			
		||||
# at https://code.eliotberriot.com/funkwhale/funkwhale/blob/develop/deploy/funkwhale_proxy.conf
 | 
			
		||||
# at https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/deploy/funkwhale_proxy.conf
 | 
			
		||||
# your proxy will also need to support websockets
 | 
			
		||||
 | 
			
		||||
real_ip_header X-Forwarded-For;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -13,7 +13,7 @@ do not include folder-based endpoints, as it does not match our internal model a
 | 
			
		|||
and will require substantial effort to emulate.
 | 
			
		||||
 | 
			
		||||
We'll try to keep this list up-to-date, but you can also browse `the relevant code
 | 
			
		||||
<https://code.eliotberriot.com/funkwhale/funkwhale/blob/develop/api/funkwhale_api/subsonic/views.py>`_
 | 
			
		||||
<https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/api/funkwhale_api/subsonic/views.py>`_
 | 
			
		||||
if needed.
 | 
			
		||||
 | 
			
		||||
As of today, the following endpoints are implemented:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -68,7 +68,7 @@ local and remote users.
 | 
			
		|||
 | 
			
		||||
Links:
 | 
			
		||||
 | 
			
		||||
- `Federation models <https://code.eliotberriot.com/funkwhale/funkwhale/blob/develop/api/funkwhale_api/federation/models.py>`_
 | 
			
		||||
- `Federation models <https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/api/funkwhale_api/federation/models.py>`_
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Activity creation and delivery
 | 
			
		||||
| 
						 | 
				
			
			@ -98,8 +98,8 @@ table, retrieve the audio cover, etc.
 | 
			
		|||
 | 
			
		||||
Links:
 | 
			
		||||
 | 
			
		||||
- `Routing logic for activities <https://code.eliotberriot.com/funkwhale/funkwhale/blob/develop/api/funkwhale_api/federation/routes.py>`_
 | 
			
		||||
- `Delivery logic for activities <https://code.eliotberriot.com/funkwhale/funkwhale/blob/develop/api/funkwhale_api/federation/tasks.py>`_
 | 
			
		||||
- `Routing logic for activities <https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/api/funkwhale_api/federation/routes.py>`_
 | 
			
		||||
- `Delivery logic for activities <https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/api/funkwhale_api/federation/tasks.py>`_
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Supported activities
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -138,8 +138,8 @@ under creative commons (courtesy of Jamendo):
 | 
			
		|||
 | 
			
		||||
.. parsed-literal::
 | 
			
		||||
 | 
			
		||||
    curl -L -o download-tracks.sh "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/demo/download-tracks.sh"
 | 
			
		||||
    curl -L -o music.txt "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/demo/music.txt"
 | 
			
		||||
    curl -L -o download-tracks.sh "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/|version|/demo/download-tracks.sh"
 | 
			
		||||
    curl -L -o music.txt "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/|version|/demo/music.txt"
 | 
			
		||||
    chmod +x download-tracks.sh
 | 
			
		||||
    ./download-tracks.sh music.txt
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -91,7 +91,7 @@ First, we'll download the latest api release.
 | 
			
		|||
 | 
			
		||||
.. parsed-literal::
 | 
			
		||||
 | 
			
		||||
    curl -L -o "api-|version|.zip" "https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/|version|/download?job=build_api"
 | 
			
		||||
    curl -L -o "api-|version|.zip" "https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/|version|/download?job=build_api"
 | 
			
		||||
    unzip "api-|version|.zip" -d extracted
 | 
			
		||||
    mv extracted/api/* api/
 | 
			
		||||
    rm -rf extracted
 | 
			
		||||
| 
						 | 
				
			
			@ -101,7 +101,7 @@ Then we'll download the frontend files:
 | 
			
		|||
 | 
			
		||||
.. parsed-literal::
 | 
			
		||||
 | 
			
		||||
    curl -L -o "front-|version|.zip" "https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/|version|/download?job=build_front"
 | 
			
		||||
    curl -L -o "front-|version|.zip" "https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/|version|/download?job=build_front"
 | 
			
		||||
    unzip "front-|version|.zip" -d extracted
 | 
			
		||||
    mv extracted/front .
 | 
			
		||||
    rm -rf extracted
 | 
			
		||||
| 
						 | 
				
			
			@ -115,7 +115,7 @@ Then we'll download the frontend files:
 | 
			
		|||
 | 
			
		||||
        rm -r funkwhale
 | 
			
		||||
 | 
			
		||||
        git clone -b master https://code.eliotberriot.com/funkwhale/funkwhale funkwhale
 | 
			
		||||
        git clone -b master https://dev.funkwhale.audio/funkwhale/funkwhale funkwhale
 | 
			
		||||
 | 
			
		||||
        cd funkwhale
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -212,7 +212,7 @@ Download the sample environment file:
 | 
			
		|||
 | 
			
		||||
.. parsed-literal::
 | 
			
		||||
 | 
			
		||||
    curl -L -o config/.env "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/env.prod.sample"
 | 
			
		||||
    curl -L -o config/.env "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/develop/deploy/env.prod.sample"
 | 
			
		||||
 | 
			
		||||
.. note::
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,16 +11,16 @@ Download the sample docker-compose file:
 | 
			
		|||
 | 
			
		||||
    cd /srv/funkwhale
 | 
			
		||||
    mkdir nginx
 | 
			
		||||
    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"
 | 
			
		||||
    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"
 | 
			
		||||
 | 
			
		||||
Create your env file:
 | 
			
		||||
 | 
			
		||||
.. parsed-literal::
 | 
			
		||||
 | 
			
		||||
    export FUNKWHALE_VERSION="|version|"
 | 
			
		||||
    curl -L -o .env "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/env.prod.sample"
 | 
			
		||||
    curl -L -o .env "https://dev.funkwhale.audio/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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -113,7 +113,7 @@ Files for the web frontend are purely static and can simply be downloaded, unzip
 | 
			
		|||
.. parsed-literal::
 | 
			
		||||
 | 
			
		||||
    cd /srv/funkwhale
 | 
			
		||||
    curl -L -o front.zip "https://code.eliotberriot.com/funkwhale/funkwhale/builds/artifacts/|version|/download?job=build_front"
 | 
			
		||||
    curl -L -o front.zip "https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/|version|/download?job=build_front"
 | 
			
		||||
    unzip front.zip
 | 
			
		||||
 | 
			
		||||
.. _reverse-proxy-setup:
 | 
			
		||||
| 
						 | 
				
			
			@ -148,15 +148,15 @@ On docker deployments, run the following commands:
 | 
			
		|||
.. 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"
 | 
			
		||||
    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/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"
 | 
			
		||||
 | 
			
		||||
    # create a final nginx configuration using the template based on your environment
 | 
			
		||||
    set -a && source /srv/funkwhale/.env && set +a
 | 
			
		||||
    envsubst "`env | awk -F = '{printf \" $%s\", $$1}'`" \
 | 
			
		||||
        < /etc/nginx/sites-available/funkwhale.template \
 | 
			
		||||
        > /etc/nginx/sites-available/funkwhale.conf
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
    ln -s /etc/nginx/sites-available/funkwhale.conf /etc/nginx/sites-enabled/
 | 
			
		||||
 | 
			
		||||
On non-docker deployments, run the following commands:
 | 
			
		||||
| 
						 | 
				
			
			@ -164,15 +164,15 @@ On non-docker deployments, run the following commands:
 | 
			
		|||
.. 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"
 | 
			
		||||
    curl -L -o /etc/nginx/sites-available/funkwhale.template "https://code.eliotberriot.com/funkwhale/funkwhale/raw/develop/deploy/nginx.template"
 | 
			
		||||
    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"
 | 
			
		||||
 | 
			
		||||
    # create a final nginx configuration using the template based on your environment
 | 
			
		||||
    set -a && source /srv/funkwhale/config/.env && set +a
 | 
			
		||||
    envsubst "`env | awk -F = '{printf \" $%s\", $$1}'`" \
 | 
			
		||||
        < /etc/nginx/sites-available/funkwhale.template \
 | 
			
		||||
        > /etc/nginx/sites-available/funkwhale.conf
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    ln -s /etc/nginx/sites-available/funkwhale.conf /etc/nginx/sites-enabled/
 | 
			
		||||
 | 
			
		||||
.. note::
 | 
			
		||||
| 
						 | 
				
			
			@ -219,7 +219,7 @@ Then, download our sample virtualhost file:
 | 
			
		|||
 | 
			
		||||
.. parsed-literal::
 | 
			
		||||
 | 
			
		||||
    curl -L -o /etc/apache2/sites-available/funkwhale.conf "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/deploy/apache.conf"
 | 
			
		||||
    curl -L -o /etc/apache2/sites-available/funkwhale.conf "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/|version|/deploy/apache.conf"
 | 
			
		||||
    ln -s /etc/apache2/sites-available/funkwhale.conf /etc/apache2/sites-enabled/
 | 
			
		||||
 | 
			
		||||
You can tweak the configuration file according to your setup, especially the
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,10 +10,10 @@ First, download the sample unitfiles:
 | 
			
		|||
 | 
			
		||||
.. parsed-literal::
 | 
			
		||||
 | 
			
		||||
    curl -L -o "/etc/systemd/system/funkwhale.target" "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/deploy/funkwhale.target"
 | 
			
		||||
    curl -L -o "/etc/systemd/system/funkwhale-server.service" "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/deploy/funkwhale-server.service"
 | 
			
		||||
    curl -L -o "/etc/systemd/system/funkwhale-worker.service" "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/deploy/funkwhale-worker.service"
 | 
			
		||||
    curl -L -o "/etc/systemd/system/funkwhale-beat.service" "https://code.eliotberriot.com/funkwhale/funkwhale/raw/|version|/deploy/funkwhale-beat.service"
 | 
			
		||||
    curl -L -o "/etc/systemd/system/funkwhale.target" "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/|version|/deploy/funkwhale.target"
 | 
			
		||||
    curl -L -o "/etc/systemd/system/funkwhale-server.service" "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/|version|/deploy/funkwhale-server.service"
 | 
			
		||||
    curl -L -o "/etc/systemd/system/funkwhale-worker.service" "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/|version|/deploy/funkwhale-worker.service"
 | 
			
		||||
    curl -L -o "/etc/systemd/system/funkwhale-beat.service" "https://dev.funkwhale.audio/funkwhale/funkwhale/raw/|version|/deploy/funkwhale-beat.service"
 | 
			
		||||
 | 
			
		||||
This will download three unitfiles:
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -194,7 +194,7 @@ Here are a few recommendations on how to structure and what to include in your h
 | 
			
		|||
- Give us as much context as possible about your installation (OS, version, Docker/non-docker, reverse-proxy type, relevant logs and errors, etc.)
 | 
			
		||||
- Including screenshots or small gifs or videos can help us considerably when debugging front-end issues
 | 
			
		||||
 | 
			
		||||
You can also open issues on our `issue tracker <https://code.eliotberriot.com/funkwhale/funkwhale/issues>`_. Please have a quick look for
 | 
			
		||||
You can also open issues on our `issue tracker <https://dev.funkwhale.audio/funkwhale/funkwhale/issues>`_. Please have a quick look for
 | 
			
		||||
similar issues before doing that, and use the issue tracker only to report bugs, suggest enhancements (both in the software and the documentation) or new features.
 | 
			
		||||
 | 
			
		||||
.. warning::
 | 
			
		||||
| 
						 | 
				
			
			@ -208,5 +208,5 @@ Improving this documentation
 | 
			
		|||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 | 
			
		||||
 | 
			
		||||
If you feel like something should be improved in this document (and in the documentation in general), feel free to `edit
 | 
			
		||||
it <https://code.eliotberriot.com/funkwhale/funkwhale/tree/develop/docs>`_ and open a Merge Request. If you lack time or skills
 | 
			
		||||
it <https://dev.funkwhale.audio/funkwhale/funkwhale/tree/develop/docs>`_ and open a Merge Request. If you lack time or skills
 | 
			
		||||
to do that, you can open an issue to discuss that, and someone else will do it.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,7 +12,7 @@ Overview of the changes
 | 
			
		|||
 | 
			
		||||
.. note::
 | 
			
		||||
 | 
			
		||||
    The what and why are described more thoroughly in this page: https://code.eliotberriot.com/funkwhale/funkwhale/merge_requests/368
 | 
			
		||||
    The what and why are described more thoroughly in this page: https://dev.funkwhale.audio/funkwhale/funkwhale/merge_requests/368
 | 
			
		||||
 | 
			
		||||
To sum it up, this release big completely changes the way audio content is managed in Funkwhale.
 | 
			
		||||
As you may guess, this has a huge impact on the whole project, because audio is at the
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -45,8 +45,8 @@ easy:
 | 
			
		|||
    # Load your environment variables
 | 
			
		||||
    source .env
 | 
			
		||||
    # Download newest nginx configuration file
 | 
			
		||||
    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 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"
 | 
			
		||||
    # Pull the new version containers
 | 
			
		||||
    docker-compose pull
 | 
			
		||||
    # Apply the database migrations
 | 
			
		||||
| 
						 | 
				
			
			@ -81,7 +81,7 @@ The following example assume your setup match :ref:`frontend-setup`.
 | 
			
		|||
    # this assumes you want to upgrade to version "|version|"
 | 
			
		||||
    export FUNKWHALE_VERSION="|version|"
 | 
			
		||||
    cd /srv/funkwhale
 | 
			
		||||
    sudo -u funkwhale curl -L -o front.zip "https://code.eliotberriot.com/funkwhale/funkwhale/builds/artifacts/$FUNKWHALE_VERSION/download?job=build_front"
 | 
			
		||||
    sudo -u funkwhale curl -L -o front.zip "https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/$FUNKWHALE_VERSION/download?job=build_front"
 | 
			
		||||
    sudo -u funkwhale unzip -o front.zip
 | 
			
		||||
    sudo -u funkwhale rm front.zip
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -98,7 +98,7 @@ match what is described in :doc:`/installation/debian`:
 | 
			
		|||
    cd /srv/funkwhale
 | 
			
		||||
 | 
			
		||||
    # download more recent API files
 | 
			
		||||
    sudo -u funkwhale curl -L -o "api-$FUNKWHALE_VERSION.zip" "https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/$FUNKWHALE_VERSION/download?job=build_api"
 | 
			
		||||
    sudo -u funkwhale curl -L -o "api-$FUNKWHALE_VERSION.zip" "https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/$FUNKWHALE_VERSION/download?job=build_api"
 | 
			
		||||
    sudo -u funkwhale unzip "api-$FUNKWHALE_VERSION.zip" -d extracted
 | 
			
		||||
    sudo -u funkwhale rm -rf api/ && mv extracted/api .
 | 
			
		||||
    sudo -u funkwhale rm -rf extracted
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,4 +9,4 @@ git reset --hard weblate/develop
 | 
			
		|||
git push -f origin $integration_branch
 | 
			
		||||
 | 
			
		||||
echo "Branch created on pushed on origin/$integration_branch"
 | 
			
		||||
echo "Open a merge request by visiting https://code.eliotberriot.com/funkwhale/funkwhale/merge_requests/new?merge_request%5Bsource_branch%5D=$integration_branch"
 | 
			
		||||
echo "Open a merge request by visiting https://dev.funkwhale.audio/funkwhale/funkwhale/merge_requests/new?merge_request%5Bsource_branch%5D=$integration_branch"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -39,7 +39,7 @@
 | 
			
		|||
          <div class="ui link list">
 | 
			
		||||
            <a href="https://socialhub.network/c/projects/funkwhale" class="item" target="_blank"><translate>Support forum</translate></a>
 | 
			
		||||
            <a href="https://riot.im/app/#/room/#funkwhale-troubleshooting:matrix.org" class="item" target="_blank"><translate>Chat room</translate></a>
 | 
			
		||||
            <a href="https://code.eliotberriot.com/funkwhale/funkwhale/issues" class="item" target="_blank"><translate>Issue tracker</translate></a>
 | 
			
		||||
            <a href="https://dev.funkwhale.audio/funkwhale/funkwhale/issues" class="item" target="_blank"><translate>Issue tracker</translate></a>
 | 
			
		||||
          </div>
 | 
			
		||||
        </section>
 | 
			
		||||
        <section class="four wide column">
 | 
			
		||||
| 
						 | 
				
			
			@ -47,7 +47,7 @@
 | 
			
		|||
          <div class="ui link list">
 | 
			
		||||
            <a href="https://funkwhale.audio" class="item" target="_blank"><translate>Official website</translate></a>
 | 
			
		||||
            <a href="https://contribute.funkwhale.audio" class="item" target="_blank"><translate>Contribute</translate></a>
 | 
			
		||||
            <a href="https://code.eliotberriot.com/funkwhale/funkwhale" class="item" target="_blank"><translate>Source code</translate></a>
 | 
			
		||||
            <a href="https://dev.funkwhale.audio/funkwhale/funkwhale" class="item" target="_blank"><translate>Source code</translate></a>
 | 
			
		||||
          </div>
 | 
			
		||||
          <div class="ui hidden divider"></div>
 | 
			
		||||
          <p>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@ import gitlab
 | 
			
		|||
 | 
			
		||||
TOKEN = "CHANGEME"
 | 
			
		||||
CLEAN_BEFORE = "2018-07"
 | 
			
		||||
gl = gitlab.Gitlab("https://code.eliotberriot.com", private_token=TOKEN, per_page=100)
 | 
			
		||||
gl = gitlab.Gitlab("https://dev.funkwhale.audio", private_token=TOKEN, per_page=100)
 | 
			
		||||
project = gl.projects.get("funkwhale/funkwhale")
 | 
			
		||||
 | 
			
		||||
jobs = project.jobs.list(as_list=False)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Ładowanie…
	
		Reference in New Issue