MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed now useless private and public keys preferences

This commit is contained in:
Eliot Berriot 2018-04-07 15:48:47 +02:00
parent e10a82060d
commit bf70fa1f53
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/funkwhale_api/federation/actors.py
View File

@ -86,7 +86,6 @@ class SystemActor(object):
kwargs={'actor': self.id})) kwargs={'actor': self.id}))
def get_instance_argument(self, id, name, summary, **kwargs): def get_instance_argument(self, id, name, summary, **kwargs):
preferences = global_preferences_registry.manager()
p = { p = {
'preferred_username': id, 'preferred_username': id,
'domain': settings.FEDERATION_HOSTNAME, 'domain': settings.FEDERATION_HOSTNAME,
@ -106,8 +105,6 @@ class SystemActor(object):
reverse( reverse(
'federation:instance-actors-outbox', 'federation:instance-actors-outbox',
kwargs={'actor': id})), kwargs={'actor': id})),
'public_key': preferences['federation__public_key'],
'private_key': preferences['federation__private_key'],
'summary': summary.format(host=settings.FEDERATION_HOSTNAME) 'summary': summary.format(host=settings.FEDERATION_HOSTNAME)
} }
p.update(kwargs) p.update(kwargs)

28
api/funkwhale_api/federation/dynamic_preferences_registry.py
View File

@ -4,31 +4,3 @@ from dynamic_preferences import types
from dynamic_preferences.registries import global_preferences_registry from dynamic_preferences.registries import global_preferences_registry
federation = types.Section('federation') federation = types.Section('federation')
@global_preferences_registry.register
class FederationPrivateKey(types.StringPreference):
show_in_api = False
section = federation
name = 'private_key'
default = ''
help_text = (
'Instance private key, used for signing federation HTTP requests'
)
verbose_name = (
'Instance private key (keep it secret, do not change it)'
)
@global_preferences_registry.register
class FederationPublicKey(types.StringPreference):
show_in_api = False
section = federation
name = 'public_key'
default = ''
help_text = (
'Instance public key, used for signing federation HTTP requests'
)
verbose_name = (
'Instance public key (do not change it)'
)