Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wxcafé
funkwhale
Commits
f9481a5b
Verified
Commit
f9481a5b
authored
6 years ago
by
Eliot Berriot
Browse files
Options
Downloads
Patches
Plain Diff
Nginx conf and upgrade notes to prepare federation
parent
cdd8f032
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG
+47
-0
47 additions, 0 deletions
CHANGELOG
deploy/nginx.conf
+10
-0
10 additions, 0 deletions
deploy/nginx.conf
with
57 additions
and
0 deletions
CHANGELOG
+
47
−
0
View file @
f9481a5b
...
...
@@ -3,6 +3,53 @@ Changelog
.. towncrier
Release notes:
Preparing for federation
^^^^^^^^^^^^^^^^^^^^^^^^
In order to prepare for federation (see #136 and #137), new API endpoints
have been added under /federation and /.well-known/webfinger.
For these endpoints to work, you will need to update your nginx configuration,
and add the following snippets::
location /federation/ {
include /etc/nginx/funkwhale_proxy.conf;
proxy_pass http://funkwhale-api/federation/;
}
location /.well-known/webfinger {
include /etc/nginx/funkwhale_proxy.conf;
proxy_pass http://funkwhale-api/.well-known/webfinger;
}
This will ensure federation endpoints will be reachable in the future.
You can of course skip this part if you know you will not federate your instance.
A new ``FEDERATION_ENABLED`` env var have also been added to control wether
federation is enabled or not on the application side. This settings defaults
to True, which should have no consequencies at the moment, since actual
federation is not implemented and the only available endpoints are for
testing purposes.
Add ``FEDERATION_ENABLED=false`` to your .env file to disable federation
on the application side.
The last step involves generating RSA private and public keys for signing
your instance requests on the federation. This can be done via::
# on docker setups
docker-compose --rm api python manage.py generate_keys --no-input
# on non-docker setups
source /srv/funkwhale/virtualenv/bin/activate
source /srv/funkwhale/load_env
python manage.py generate_keys --no-input
That's it :)
0.7 (2018-03-21)
----------------
...
...
This diff is collapsed.
Click to expand it.
deploy/nginx.conf
+
10
−
0
View file @
f9481a5b
...
...
@@ -62,6 +62,16 @@ server {
proxy_pass
http://funkwhale-api/api/
;
}
location
/federation/
{
include
/etc/nginx/funkwhale_proxy.conf
;
proxy_pass
http://funkwhale-api/federation/
;
}
location
/.well-known/webfinger
{
include
/etc/nginx/funkwhale_proxy.conf
;
proxy_pass
http://funkwhale-api/.well-known/webfinger
;
}
location
/media/
{
alias
/srv/funkwhale/data/media/
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment