Revert "distros: Add a key to each distribution"

This reverts commit ce83dae7b3208e10cc11496a816343d49ad1e377.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/distribution.py b/src/buildservice/distribution.py
index 70468d1f5c1f98da09952684677a75663595bd4d..9e7f1b30868089b1cd76bfdab1102b916740e1e7 100644 (file)
--- a/src/buildservice/distribution.py
+++ b/src/buildservice/distribution.py
@@ -37,25 +37,6 @@ class Distributions(base.Object):
                return self._get_distribution("SELECT * FROM distributions \
                        WHERE slug = %s AND deleted IS FALSE", slug)
 
-       async def create(self, name, contact):
-               # Generate a key
-               key = await self.backend.keys.generate("%s <%s>" % (name, contact))
-
-               return self._get_distribution("""
-                       INSERT INTO
-                               distributions (
-                                       name,
-                                       contact,
-                                       key_id
-                               )
-                       VALUES (
-                               %s, %s, %s
-                       )
-                       RETURNING
-                               *
-                       """, name, contact, key,
-               )
-
 
 class Distribution(base.DataObject):
        table = "distributions"
@@ -171,13 +152,6 @@ class Distribution(base.DataObject):
 
        custom_config = property(get_custom_config, set_custom_config)
 
-       # Key Management
-
-       @lazy_property
-       def key(self):
-               if self.data.key_id:
-                       return self.backend.keys.get_by_id(self.data.key_id)
-
        @lazy_property
        def repos(self):
                repos = self.backend.repos._get_repositories("""

diff --git a/src/database.sql b/src/database.sql
index e9df88df59fd5760ac4c5ee6993de8ff3ce03d7c..7ae15b3104a403fab7c031e2a65194b118979796 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -383,8 +383,7 @@ CREATE TABLE public.distributions (
     deleted boolean DEFAULT false NOT NULL,
     arches text[] DEFAULT ARRAY[]::text[] NOT NULL,
     created_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP NOT NULL,
-    custom_config text DEFAULT ''::text NOT NULL,
-    key_id integer NOT NULL
+    custom_config text DEFAULT ''::text NOT NULL
 );
 
 
@@ -2248,14 +2247,6 @@ ALTER TABLE ONLY public.builds_watchers
     ADD CONSTRAINT builds_watchers_user_id FOREIGN KEY (user_id) REFERENCES public.users(id);
 
 
---
--- Name: distributions distributions_key_id; Type: FK CONSTRAINT; Schema: public; Owner: pakfire
---
-
-ALTER TABLE ONLY public.distributions
-    ADD CONSTRAINT distributions_key_id FOREIGN KEY (key_id) REFERENCES public.keys(id);
-
-
 --
 -- Name: filelists filelists_pkg_id; Type: FK CONSTRAINT; Schema: public; Owner: pakfire
 --