From 331300c6a9a0fc86d1767d3cbe39b8841f2449bf Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Wed, 26 Sep 2018 21:53:07 +0200 Subject: [PATCH] upgrade to 0.17 --- README.md | 2 +- conf/app-frontend.src | 4 ++-- conf/app.src | 4 ++-- conf/env.prod | 45 +++++++++++++++++++++++++++++++++++++------ manifest.json | 4 ++-- scripts/install | 2 +- scripts/upgrade | 2 ++ 7 files changed, 49 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 2431388..2677d34 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ A modern, convivial and free music server on YunoHost Installation requires a dedicated domain for now. I hope subpath installation will be possible in the future. -**Shipped version:** 0.16.3 (this is an Alpha version!) +**Shipped version:** 0.17.0 (this is an Alpha version!) ## Admin diff --git a/conf/app-frontend.src b/conf/app-frontend.src index 1fa7506..be8477c 100644 --- a/conf/app-frontend.src +++ b/conf/app-frontend.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/0.16.3/download?job=build_front -SOURCE_SUM=a75161e6cbf8e87ee534947f20c12e84f9ed121f10c9d9e63989703c002195a1 +SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/10544/artifacts/download +SOURCE_SUM=7968f6c176a010eb30559024afff4400f5ffc0d92ff51c353cd09f2e8ab20c0d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/app.src b/conf/app.src index f37cd42..6a3d51e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.16.3/funkwhale-0.16.3.tar.bz2 -SOURCE_SUM=6484c357fccc107a6950e4be80a9e349ec4ea962ac4df47d54c73c184786557a +SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/8bd1ed61481b42b83922c61bfee87c4f011b68d7/funkwhale-8bd1ed61481b42b83922c61bfee87c4f011b68d7.tar.bz2 +SOURCE_SUM=0027f3c63880b1b8773ac518ed463175d41bafa624479605a9627867c962f860 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true diff --git a/conf/env.prod b/conf/env.prod index 0df39ed..5df5293 100644 --- a/conf/env.prod +++ b/conf/env.prod @@ -5,16 +5,19 @@ # following variables: # - DJANGO_SECRET_KEY # - DJANGO_ALLOWED_HOSTS -# - FUNKWHALE_URL +# - FUNKWHALE_HOSTNAME # - EMAIL_CONFIG and DEFAULT_FROM_EMAIL if you plan to send emails) # On non-docker setup **only**, you'll also have to tweak/uncomment those variables: # - DATABASE_URL # - CACHE_URL -# - STATIC_ROOT -# - MEDIA_ROOT # # You **don't** need to update those variables on pure docker setups. +# +# Additional options you may want to check: +# - MUSIC_DIRECTORY_PATH and MUSIC_DIRECTORY_SERVE_PATH if you plan to use +# in-place import +# # Docker only # ----------- @@ -24,9 +27,7 @@ # You can comment or ignore this if you're not using docker # FUNKWHALE_VERSION=latest -# In-place import, see https://code.eliotberriot.com/funkwhale/funkwhale/tags/0.10 -MUSIC_DIRECTORY_SERVE_PATH=__FINALPATH__/data/music -MUSIC_DIRECTORY_PATH=__FINALPATH__/data/music +# End of Docker-only configuration # General configuration # --------------------- @@ -107,3 +108,35 @@ DJANGO_SECRET_KEY=__KEY__ # This will help us detect and correct bugs RAVEN_ENABLED=false RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f716@sentry.eliotberriot.com/5 + +# In-place import settings +# You can safely leave those settings uncommented if you don't plan to use +# in place imports. +# Typical docker setup: +# MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music +# MUSIC_DIRECTORY_SERVE_PATH=/music # docker-only +# Typical non-docker setup: +# MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music +# # MUSIC_DIRECTORY_SERVE_PATH= # stays commented, not needed + +MUSIC_DIRECTORY_SERVE_PATH=__FINALPATH__/data/music +MUSIC_DIRECTORY_PATH=__FINALPATH__/data/music + +# LDAP settings +# Use the following options to allow authentication on your Funkwhale instance +# using a LDAP directory. +# Have a look at https://docs.funkwhale.audio/installation/ldap.html for +# detailed instructions. + +# LDAP_ENABLED=False +# LDAP_SERVER_URI=ldap://your.server:389 +# LDAP_BIND_DN=cn=admin,dc=domain,dc=com +# LDAP_BIND_PASSWORD=bindpassword +# LDAP_SEARCH_FILTER=(|(cn={0})(mail={0})) +# LDAP_START_TLS=False +# LDAP_ROOT_DN=dc=domain,dc=com + +FUNKWHALE_FRONTEND_PATH=/srv/funkwhale/front/dist + +# Nginx related configuration +NGINX_MAX_BODY_SIZE=30M \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8377be9..f61e26e 100644 --- a/manifest.json +++ b/manifest.json @@ -3,12 +3,12 @@ "id": "funkwhale", "packaging_format": 1, "requirements": { - "yunohost": ">= 3.0.0" + "yunohost": ">= 3.2.0" }, "description": { "en": "A modern, convivial and free music server" }, - "version": "0.16.3~ynh1", + "version": "0.17.0~ynh1", "url": "https://funkwhale.audio", "license": "BSD-3-Clause", "maintainer": { diff --git a/scripts/install b/scripts/install index 8685e9a..841cbb5 100644 --- a/scripts/install +++ b/scripts/install @@ -72,7 +72,7 @@ ynh_app_setting_set "$app" port "$port" ynh_install_app_dependencies build-essential curl ffmpeg \ libjpeg-dev libmagic-dev libpq-dev postgresql python3-dev python3-venv \ - redis-server \ + redis-server libldap2-dev libsasl2-dev \ `# add arm support` \ zlib1g-dev libffi-dev libssl-dev diff --git a/scripts/upgrade b/scripts/upgrade index 21f0f94..88c33b3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -182,6 +182,8 @@ chmod +x "$final_path/load_env" python api/manage.py script create_actors --no-input # https://code.eliotberriot.com/funkwhale/funkwhale/tags/0.16 #image-thumbnails-manual-action-required python api/manage.py script create_image_variations --no-input + + python api/manage.py script migrate_to_user_libraries --no-input ) #=================================================