diff --git a/conf/app-frontend.src b/conf/app-frontend.src index 4166d39..c705905 100644 --- a/conf/app-frontend.src +++ b/conf/app-frontend.src @@ -1,5 +1,5 @@ SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/0.19.1/download?job=build_front -SOURCE_SUM=ae1e81cb78d4a7e6862b9a2980eb47be500313c4db276649391ff0c2f1033c26 +SOURCE_SUM=5ee39dd1cca26b244c53b24539e01906d3d0b04c9df5290e0070290a38fd1c83 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/nginx.conf b/conf/nginx.conf index f23364a..598f581 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -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/ { @@ -50,4 +50,4 @@ location /_protected/music/ { location /staticfiles/ { # django static files alias __FINALPATH__/code/data/static/; -} \ No newline at end of file +} diff --git a/manifest.json b/manifest.json index 36d161c..5697050 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "A modern, convivial and free music server" }, - "version": "0.19.1~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 } ] diff --git a/sources/extra_files/app/api/requirements/base.txt b/sources/extra_files/app/api/requirements/base.txt new file mode 100644 index 0000000..e5a02f2 --- /dev/null +++ b/sources/extra_files/app/api/requirements/base.txt @@ -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