mirror of
https://github.com/YunoHost-Apps/funkwhale_ynh.git
synced 2024-09-03 18:36:24 +02:00
Upgrade to 0.19.1 and fix channels-redis bug
Upgrade to 0.19.1 and fix channels-redis bug
This commit is contained in:
Jean-Baptiste
GitHub
commit
4d4bf0981e
8 changed files with 105 additions and 18 deletions
|
|
@ -11,7 +11,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.19.0 (this is an Alpha version!)
|
||||
**Shipped version:** 0.19.1 (this is an Alpha version!)
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
setup_private=1
|
||||
setup_public=1
|
||||
upgrade=1
|
||||
upgrade=1 from_commit=99bae16efca321ce50ba9a98c62996169195e0ba
|
||||
backup_restore=1
|
||||
multi_instance=1
|
||||
incorrect_path=0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/0.19.0/download?job=build_front
|
||||
SOURCE_SUM=2a664eb81f46c1f7c9d52d472a2a9958356eb409fed36bb2acba7bde87c7d7c6
|
||||
SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/0.19.1/download?job=build_front
|
||||
SOURCE_SUM=5ee39dd1cca26b244c53b24539e01906d3d0b04c9df5290e0070290a38fd1c83
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=zip
|
||||
SOURCE_IN_SUBDIR=false
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/0.19.0/funkwhale-0.19.0.tar.gz
|
||||
SOURCE_SUM=f74be13077819de07dfb377b6a20410543c3e43defa9a74b99588dd9c9b47291
|
||||
SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/0.19.1/funkwhale-0.19.1.tar.gz
|
||||
SOURCE_SUM=a5f2b8b51f4259b0964f7adeceeaadab6b39de3417b019b4ec505d5154adff82
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=tar.bz2
|
||||
SOURCE_IN_SUBDIR=true
|
||||
|
|
|
|||
|
|
@ -4,10 +4,8 @@
|
|||
# If you're tweaking this file from the template, ensure you edit at least the
|
||||
# following variables:
|
||||
# - DJANGO_SECRET_KEY
|
||||
# - DJANGO_ALLOWED_HOSTS
|
||||
# - 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
|
||||
|
|
@ -18,7 +16,6 @@
|
|||
# - MUSIC_DIRECTORY_PATH and MUSIC_DIRECTORY_SERVE_PATH if you plan to use
|
||||
# in-place import
|
||||
#
|
||||
|
||||
# Docker only
|
||||
# -----------
|
||||
|
||||
|
|
@ -37,7 +34,9 @@
|
|||
# example: FUNKWHALE_API_PORT=5678
|
||||
FUNKWHALE_API_IP=127.0.0.1
|
||||
FUNKWHALE_API_PORT=__PORT__
|
||||
|
||||
# The number of web workers to start in parallel. Higher means you can handle
|
||||
# more concurrent requests, but also leads to higher CPU/Memory usage
|
||||
FUNKWHALE_WEB_WORKERS=1
|
||||
# Replace this by the definitive, public domain you will use for
|
||||
# your instance
|
||||
FUNKWHALE_HOSTNAME=__DOMAIN__
|
||||
|
|
@ -53,7 +52,7 @@ FUNKWHALE_PROTOCOL=https
|
|||
# EMAIL_CONFIG=smtp+ssl://user@:password@youremail.host:465
|
||||
# EMAIL_CONFIG=smtp+tls://user@:password@youremail.host:587
|
||||
|
||||
# The email address to use to send systme emails. By default, we will
|
||||
# The email address to use to send system emails.
|
||||
# DEFAULT_FROM_EMAIL=noreply@yourdomain
|
||||
|
||||
# Depending on the reverse proxy used in front of your funkwhale instance,
|
||||
|
|
@ -73,9 +72,20 @@ DATABASE_URL=postgresql://__DBUSER__:__DBPWD__@:5432/__DBNAME__
|
|||
# Cache configuration
|
||||
# Examples:
|
||||
# CACHE_URL=redis://<host>:<port>/<database>
|
||||
# CACHE_URL=redis://localhost:6379/0
|
||||
# CACHE_URL=redis://localhost:6379/0c
|
||||
# With a password:
|
||||
# CACHE_URL=redis://:password@localhost:6379/0
|
||||
# (the extra semicolon is important)
|
||||
# Use the next one if you followed Debian installation guide
|
||||
#
|
||||
CACHE_URL=redis://127.0.0.1:6379/__REDIS_DB__
|
||||
#
|
||||
# If you want to use Redis over unix sockets, you'll actually need two variables:
|
||||
# For the cache part:
|
||||
# CACHE_URL=redis:///run/redis/redis.sock?db=0
|
||||
# For the Celery/asynchronous tasks part:
|
||||
# CELERY_BROKER_URL=redis+socket:///run/redis/redis.sock?virtual_host=0
|
||||
|
||||
|
||||
# Where media files (such as album covers or audio tracks) should be stored
|
||||
# on your system?
|
||||
|
|
@ -109,8 +119,8 @@ RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f
|
|||
# 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
|
||||
# MUSIC_DIRECTORY_PATH=/music # docker-only
|
||||
# MUSIC_DIRECTORY_SERVE_PATH=/srv/funkwhale/data/music
|
||||
# Typical non-docker setup:
|
||||
# MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music
|
||||
# # MUSIC_DIRECTORY_SERVE_PATH= # stays commented, not needed
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ location / {
|
|||
location /front/ {
|
||||
alias __FINALPATH__/code/front/dist/;
|
||||
expires 30d;
|
||||
add_header Pragma public;
|
||||
add_header Cache-Control "public, must-revalidate, proxy-revalidate";
|
||||
more_set_headers Pragma public;
|
||||
more_set_headers Cache-Control "public, must-revalidate, proxy-revalidate";
|
||||
}
|
||||
|
||||
location /federation/ {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"description": {
|
||||
"en": "A modern, convivial and free music server"
|
||||
},
|
||||
"version": "0.19.0~ynh1",
|
||||
"version": "0.19.1~ynh2",
|
||||
"url": "https://funkwhale.audio",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"maintainer": {
|
||||
|
|
@ -43,6 +43,9 @@
|
|||
"ask": {
|
||||
"en": "Is it a public application?"
|
||||
},
|
||||
"help": {
|
||||
"en": "Allows non loggued users to access the user interface (mandatory for federation)"
|
||||
},
|
||||
"default": true
|
||||
}
|
||||
]
|
||||
|
|
|
|||
75
sources/extra_files/app/api/requirements/base.txt
Normal file
75
sources/extra_files/app/api/requirements/base.txt
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
# Bleeding edge Django
|
||||
django>=2.2.1,<2.3
|
||||
|
||||
# Configuration
|
||||
django-environ>=0.4,<0.5
|
||||
|
||||
# Images
|
||||
Pillow>=5.4,<5.5
|
||||
|
||||
# For user registration, either via email or social
|
||||
# Well-built with regular release cycles!
|
||||
django-allauth>=0.39,<0.40
|
||||
|
||||
|
||||
# Python-PostgreSQL Database Adapter
|
||||
psycopg2-binary>=2.8,<=2.9
|
||||
|
||||
# Time zones support
|
||||
pytz==2019.1
|
||||
|
||||
# Redis support
|
||||
django-redis>=4.10,<4.11
|
||||
redis>=3.2,<3.3
|
||||
kombu>=4.5,<4.6
|
||||
|
||||
celery>=4.3,<4.4
|
||||
|
||||
|
||||
# Your custom requirements go here
|
||||
django-cors-headers>=2.5.3,<2.6
|
||||
musicbrainzngs==0.6
|
||||
djangorestframework>=3.9,<3.10
|
||||
djangorestframework-jwt>=1.11,<1.12
|
||||
pendulum>=2,<3
|
||||
persisting-theory>=0.2,<0.3
|
||||
django-versatileimagefield>=1.10,<1.11
|
||||
django-filter>=2.1,<2.2
|
||||
django-rest-auth>=0.9,<0.10
|
||||
ipython>=7,<8
|
||||
mutagen>=1.42,<1.43
|
||||
|
||||
|
||||
django-taggit>=0.24,<0.25
|
||||
pymemoize==1.0.3
|
||||
|
||||
django-dynamic-preferences>=1.7,<1.8
|
||||
raven>=6.10,<7
|
||||
python-magic==0.4.15
|
||||
# XXX: until https://github.com/django/channels/issues/1240 is fixed
|
||||
channels==2.1.6
|
||||
# suggestion by Eliot Berriot, this dep will be remove in next version anyway
|
||||
# channels_redis>=2.3,<2.4
|
||||
channels_redis==2.3.2
|
||||
|
||||
daphne>=2.2,<2.3
|
||||
|
||||
cryptography>=2,<3
|
||||
# requests-http-signature==0.0.3
|
||||
# clone until the branch is merged and released upstream
|
||||
git+https://github.com/EliotBerriot/requests-http-signature.git@signature-header-support
|
||||
django-cleanup==3.2.0
|
||||
|
||||
# for LDAP authentication
|
||||
python-ldap==3.2.0
|
||||
django-auth-ldap==1.7.0
|
||||
pydub==0.23.1
|
||||
|
||||
pyld==1.0.4
|
||||
aiohttp==3.5.4
|
||||
autobahn>=19.3.3
|
||||
|
||||
django-oauth-toolkit==1.2
|
||||
django-storages==1.7.1
|
||||
boto3<3
|
||||
unicode-slugify
|
||||
Loading…
Add table
Reference in a new issue