From bf70fa1f537f38774d7e97d1ab53a16d7459bbeb Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 7 Apr 2018 15:48:47 +0200
Subject: [PATCH] Removed now useless private and public keys preferences
---
api/funkwhale_api/federation/actors.py | 3 --
.../dynamic_preferences_registry.py | 28 -------------------
2 files changed, 31 deletions(-)
diff --git a/api/funkwhale_api/federation/actors.py b/api/funkwhale_api/federation/actors.py
index f640c9b1..54d78d9f 100644
--- a/api/funkwhale_api/federation/actors.py
+++ b/api/funkwhale_api/federation/actors.py
@@ -86,7 +86,6 @@ class SystemActor(object):
kwargs={'actor': self.id}))
def get_instance_argument(self, id, name, summary, **kwargs):
- preferences = global_preferences_registry.manager()
p = {
'preferred_username': id,
'domain': settings.FEDERATION_HOSTNAME,
@@ -106,8 +105,6 @@ class SystemActor(object):
reverse(
'federation:instance-actors-outbox',
kwargs={'actor': id})),
- 'public_key': preferences['federation__public_key'],
- 'private_key': preferences['federation__private_key'],
'summary': summary.format(host=settings.FEDERATION_HOSTNAME)
}
p.update(kwargs)
diff --git a/api/funkwhale_api/federation/dynamic_preferences_registry.py b/api/funkwhale_api/federation/dynamic_preferences_registry.py
index 83d0285b..c7cb015a 100644
--- a/api/funkwhale_api/federation/dynamic_preferences_registry.py
+++ b/api/funkwhale_api/federation/dynamic_preferences_registry.py
@@ -4,31 +4,3 @@ from dynamic_preferences import types
from dynamic_preferences.registries import global_preferences_registry
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)'
- )
--
GitLab