From e28f0a89c5f62f9bea06be3db53e3f6cb5a9bf03 Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Tue, 22 Jan 2019 13:04:23 +0100 Subject: [PATCH 01/25] Typo --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index e7ba4d933..22ccba6dc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -174,7 +174,7 @@ Enable gzip compression [manual action suggested] Gzip compression will be enabled on new instances by default and will reduce the amount of bandwidth consumed by your instance. -If you with to benefit from gzip compression on your instance, +If you want to benefit from gzip compression on your instance, edit your reverse proxy virtualhost file (located at ``/etc/nginx/sites-available/funkwhale.conf``) and add the following snippet in the server block, then reload your nginx server:: From 7488957c6ec28c6d3bfbb6bb51ef2d81a4caa766 Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Tue, 22 Jan 2019 13:06:19 +0100 Subject: [PATCH 02/25] Typo --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 22ccba6dc..beec25702 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -67,7 +67,7 @@ Instance-level moderation tools ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This release includes a first set of moderation tools that will give more control -to admins about the way their instance federate with other instance and accounts on the network. +to admins about the way their instance federates with other instance and accounts on the network. Using these tools, it's now possible to: - Browse known accounts and domains, and associated data (storage size, software version, etc.) From e6995dc496ed2703ff9bb1c601aa81912f91727b Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Tue, 22 Jan 2019 13:07:24 +0100 Subject: [PATCH 03/25] Typos --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index beec25702..fbd271822 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -75,7 +75,7 @@ Using these tools, it's now possible to: - Block or partially restrict interactions with any account or domain All those features are usable using a brand new "moderation" permission, meaning -you can appoints one or nultiple moderators to help with this task. +you can appoint one or multiple moderators to help with this task. I'd like to thank all Mastodon contributors, because some of the these tools are heavily inspired from what's being done in Mastodon. Thank you so much! From 47ee8c99c2cfff2d4938e52f2e067579966ad29e Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Tue, 22 Jan 2019 13:08:48 +0100 Subject: [PATCH 04/25] Missing word --- CHANGELOG | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fbd271822..6bb62394a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -84,7 +84,7 @@ inspired from what's being done in Mastodon. Thank you so much! Iframe widget to embed public tracks and albums [manual action required] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Funkwhale now support embedding a lightweight audio player on external websites +Funkwhale now supports embedding a lightweight audio player on external websites for album and tracks that are available in public libraries. Important pages, such as artist, album and track pages also include OpenGraph tags that will enable previews on compatible apps (like sharing a Funkwhale track link on Mastodon @@ -132,7 +132,7 @@ which should be ``/srv/funkwhale/front/dist`` by default, then reload your nginx Alternative docker deployment method ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Thanks to the awesome done by @thetarkus at https://github.com/thetarkus/docker-funkwhale, +Thanks to the awesome work done by @thetarkus at https://github.com/thetarkus/docker-funkwhale, we're now able to provide an alternative and easier Docker deployment method! In contrast with our current, multi-container offer, this method integrates From ed4c36040e038693e8348b5e5c748b13052d03a0 Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Tue, 22 Jan 2019 13:09:24 +0100 Subject: [PATCH 05/25] Typo --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 6bb62394a..fdd65543a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -138,7 +138,7 @@ we're now able to provide an alternative and easier Docker deployment method! In contrast with our current, multi-container offer, this method integrates all Funkwhale processes and services (database, redis, etc.) into a single, easier to deploy container. -Both method will coexist in parallel, as each one has pros and cons. You can learn more +Both methods will coexist in parallel, as each one has pros and cons. You can learn more about this exciting new deployment option by visiting https://docs.funkwhale.audio/installation/docker.html! Automatically load .env file From 6f6f6ac2b395e6d1d3c9b0171586f95c646c8368 Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Tue, 22 Jan 2019 13:10:14 +0100 Subject: [PATCH 06/25] Typo --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index fdd65543a..0b8505669 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -146,7 +146,7 @@ Automatically load .env file On non-docker deployments, earlier versions required you to source the config/.env file before launching any Funkwhale command, with ``export $(cat config/.env | grep -v ^# | xargs)`` -This led to more complex and error prode deployment / setup. +This led to more complex and error prone deployment / setup. This is not the case anymore, and Funkwhale will automatically load this file if it's available. From a7f496af1e70595098eadd5ed835380192a0c5f4 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Tue, 22 Jan 2019 13:40:32 +0100 Subject: [PATCH 07/25] Added translations compilation instructions for front-end --- CONTRIBUTING.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 9c59fd4be..19f034b9f 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -41,15 +41,19 @@ Setup front-end only development environment yarn install -4. Launch the development server:: +4. Compile the translations:: + + yarn i18n-compile + +5. Launch the development server:: # this will serve the front-end on http://localhost:8000/front/ VUE_PORT=8000 yarn serve -5. Make the front-end talk with an existing server (like https://demo.funkwhale.audio), +6. Make the front-end talk with an existing server (like https://demo.funkwhale.audio or https://open.audio), by clicking on the corresponding link in the footer -6. Start hacking! +7. Start hacking! Setup your development environment ---------------------------------- From 8af6b6ce08788b5c31b5aa9a40458a068f8836cb Mon Sep 17 00:00:00 2001 From: Renon Date: Tue, 22 Jan 2019 16:19:25 +0100 Subject: [PATCH 08/25] fix apache conf file for 0.18 --- changes/changelog.d/667.bugfix | 1 + deploy/apache.conf | 18 ++++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 changes/changelog.d/667.bugfix diff --git a/changes/changelog.d/667.bugfix b/changes/changelog.d/667.bugfix new file mode 100644 index 000000000..d553867ca --- /dev/null +++ b/changes/changelog.d/667.bugfix @@ -0,0 +1 @@ +Make Apache configuration file work with 0.18 changes (#667) diff --git a/deploy/apache.conf b/deploy/apache.conf index f348566a0..764ff6a13 100644 --- a/deploy/apache.conf +++ b/deploy/apache.conf @@ -46,10 +46,6 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music # Tell the api that the client is using https RequestHeader set X-Forwarded-Proto "https" - DocumentRoot /srv/funkwhale/front/dist - - FallbackResource /index.html - # Configure Proxy settings # ProxyPreserveHost pass the original Host header to the backend server ProxyVia On @@ -68,15 +64,12 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music Allow from all - # Activating WebSockets - ProxyPass "/api/v1/activity" ${funkwhale-api-ws}/api/v1/activity - - + # similar to nginx 'client_max_body_size 100M;' LimitRequestBody 104857600 - ProxyPass ${funkwhale-api}/api - ProxyPassReverse ${funkwhale-api}/api + ProxyPass ${funkwhale-api}/ + ProxyPassReverse ${funkwhale-api}/ ProxyPass ${funkwhale-api}/federation @@ -94,8 +87,13 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music ProxyPassReverse ${funkwhale-api}/.well-known/ + ProxyPass "/front" "!" + Alias /front /srv/funkwhale/front/dist + + ProxyPass "/media" "!" Alias /media /srv/funkwhale/data/media + ProxyPass "/staticfiles" "!" Alias /staticfiles /srv/funkwhale/data/static # Setting appropriate access levels to serve frontend From 478b434858b4097e4c6de971e5d1465d43ccd690 Mon Sep 17 00:00:00 2001 From: Renon Date: Thu, 24 Jan 2019 10:21:34 +0100 Subject: [PATCH 09/25] add release notes for apache config --- changes/notes.rst | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/changes/notes.rst b/changes/notes.rst index 96ac3d765..8e54adf8b 100644 --- a/changes/notes.rst +++ b/changes/notes.rst @@ -5,3 +5,38 @@ Next release notes Those release notes refer to the current development branch and are reset after each release. + +Fix Apache configuration file for 0.18 [manual action required] +---------------------------------------------------------- + +The way front is served has changed since 0.18. The Apache configuration can't serve 0.18 properly, leading to blank screens. + +If you are on an Apache setup, you will have to replace the `` block with the following:: + + + # similar to nginx 'client_max_body_size 100M;' + LimitRequestBody 104857600 + + ProxyPass ${funkwhale-api}/ + ProxyPassReverse ${funkwhale-api}/ + + +And add some more `ProxyPass` directives so that the `Alias` part of your configuration file looks this way:: + + ProxyPass "/front" "!" + Alias /front /srv/funkwhale/front/dist + + ProxyPass "/media" "!" + Alias /media /srv/funkwhale/data/media + + ProxyPass "/staticfiles" "!" + Alias /staticfiles /srv/funkwhale/data/static + +In case you are using custom css and theming, you also need to match this block:: + + ProxyPass "/settings.json" "!" + Alias /settings.json /srv/funkwhale/custom/settings.json + + ProxyPass "/custom" "!" + Alias /custom /srv/funkwhale/custom + From cfb458f407661a439a78722fd1d6125a5449dea4 Mon Sep 17 00:00:00 2001 From: Renon Date: Thu, 24 Jan 2019 10:34:50 +0100 Subject: [PATCH 10/25] readds websocket for apache --- deploy/apache.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/apache.conf b/deploy/apache.conf index 764ff6a13..52eee9533 100644 --- a/deploy/apache.conf +++ b/deploy/apache.conf @@ -64,6 +64,9 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music Allow from all + # Activating WebSockets + ProxyPass "/api/v1/activity" ${funkwhale-api-ws}/api/v1/activity + # similar to nginx 'client_max_body_size 100M;' LimitRequestBody 104857600 From 43e33294e5c1da8a146595a2cae5a3545d5ce07e Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Thu, 24 Jan 2019 13:15:58 +0100 Subject: [PATCH 11/25] Modified tooltip of PlayButton --- front/src/components/audio/PlayButton.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/components/audio/PlayButton.vue b/front/src/components/audio/PlayButton.vue index 27a052269..d438a14a0 100644 --- a/front/src/components/audio/PlayButton.vue +++ b/front/src/components/audio/PlayButton.vue @@ -67,7 +67,7 @@ export default { }, title () { if (this.playable) { - return this.$gettext('Play now') + return this.$gettext('Play...') } else { if (this.track) { return this.$gettext('This track is not available in any library you have access to') From 2af6f89545be9d8bece6e11793bb19ecc8f1cdbf Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Thu, 24 Jan 2019 13:16:57 +0100 Subject: [PATCH 12/25] Reformulated string --- front/src/components/auth/Profile.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/components/auth/Profile.vue b/front/src/components/auth/Profile.vue index 32dae5336..73c9ab2d9 100644 --- a/front/src/components/auth/Profile.vue +++ b/front/src/components/auth/Profile.vue @@ -10,7 +10,7 @@
{{ profile.username }} -
Registered since %{ date }
+
Member since %{ date }
From 4b585f3ee2e6386acf16b9319c25212c73691343 Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Thu, 24 Jan 2019 13:28:32 +0100 Subject: [PATCH 13/25] Replaced 'dot-dot-dot- by ellipsis --- front/src/components/audio/Player.vue | 2 +- front/src/components/manage/moderation/DomainsTable.vue | 2 +- front/src/views/content/remote/Home.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue index e010f151e..575f68736 100644 --- a/front/src/components/audio/Player.vue +++ b/front/src/components/audio/Player.vue @@ -65,7 +65,7 @@ We cannot load this track

- The next track will play automatically in a few seconds... + The next track will play automatically in a few seconds…

diff --git a/front/src/components/manage/moderation/DomainsTable.vue b/front/src/components/manage/moderation/DomainsTable.vue index 835b04db5..cf3025c14 100644 --- a/front/src/components/manage/moderation/DomainsTable.vue +++ b/front/src/components/manage/moderation/DomainsTable.vue @@ -148,7 +148,7 @@ export default { computed: { labels () { return { - searchPlaceholder: this.$gettext('Search by name...') + searchPlaceholder: this.$gettext('Search by name…') } }, actionFilters () { diff --git a/front/src/views/content/remote/Home.vue b/front/src/views/content/remote/Home.vue index 636b2fb8c..007fbadca 100644 --- a/front/src/views/content/remote/Home.vue +++ b/front/src/views/content/remote/Home.vue @@ -1,7 +1,7 @@