bw/bundles/postgresql: do not auto-detect postgresql version from debian version

bundles/postgresql/metadata.py

@@ -70,7 +70,6 @@ else:
 
 @metadata_reactor.provides(
     'apt/repos/postgresql',
-    'postgresql/version',
 )
 def default_postgresql_version_for_debian(metadata):
     # <https://packages.debian.org/search?keywords=postgresql>
@@ -79,7 +78,7 @@ def default_postgresql_version_for_debian(metadata):
         '11': '13', # bullseye
     }
     os = str(node.os_version[0])
-    version_to_be_installed = metadata.get('postgresql/version', versions_in_debian[os])
+    version_to_be_installed = metadata.get('postgresql/version')
 
     if version_to_be_installed != versions_in_debian[os]:
         return {
@@ -92,16 +91,9 @@ def default_postgresql_version_for_debian(metadata):
                     },
                 },
             },
-            'postgresql': {
-                'version': version_to_be_installed,
-            },
         }
 
-    return {
-        'postgresql': {
-            'version': version_to_be_installed,
-        },
-    }
+    return {}
 
 
 @metadata_reactor.provides(

nodes/gce/bind01.py

@@ -43,6 +43,9 @@ nodes['gce.bind01'] = {
                 },
             },
         },
+        'postgresql': {
+            'version': '11',
+        },
         'powerdns': {
             'is_secondary': False,
             'secondary_nameservers': 'dns',

nodes/gce/dns02.py

@@ -24,6 +24,9 @@ nodes['gce.dns02'] = {
         'backups': {
             'exclude_from_backups': True,
         },
+        'postgresql': {
+            'version': '11',
+        },
         'powerdns': {
             'my_hostname': 'ns-2.kunbox.net',
         },

nodes/gce/dns03.py

@@ -23,6 +23,9 @@ nodes['gce.dns03'] = {
         },
         'backups': {
             'exclude_from_backups': True,
+       },
+        'postgresql': {
+            'version': '11',
         },
         'powerdns': {
             'my_hostname': 'ns-3.kunbox.net',

nodes/home/paperless-sophie.py

@@ -68,6 +68,9 @@ nodes['home.paperless-sophie'] = {
             'version': 'ng-1.4.4',
             'timezone': 'Europe/Berlin',
         },
+        'postgresql': {
+            'version': '11',
+        },
         'vm': {
             'cpu': 2,
             'ram': 2,

nodes/home/paperless.py

@@ -58,6 +58,9 @@ nodes['home.paperless'] = {
             'version': 'ng-1.4.4',
             'timezone': 'Europe/Berlin',
         },
+        'postgresql': {
+            'version': '11',
+        },
         'vm': {
             'cpu': 2,
             'ram': 2,

nodes/htz-cloud/luther.py

@@ -68,6 +68,7 @@ nodes['htz-cloud.luther'] = {
             },
         },
         'postgresql': {
+            'version': '11',
             'users': {
                 'luther-ps': {
                     # can't use password_for() here, application is unmanaged

nodes/htz-cloud/pirmasens.py

@@ -84,6 +84,9 @@ nodes['htz-cloud.pirmasens'] = {
             'version': '3.3.10',
             'setup_password': vault.decrypt('encrypt$gAAAAABgnNGpAqUs--qBXII9ZPcHtxaELy9e2Dx9O44n4l0O4nMHPoIyaPW5HkvpQ2zWTlh5OfjjOgunRtE_voJuY0Kdtji37ixAnuL9ErOJ0LDY5QfMkNPUgPs5alwz1baqYq6rqJ7NDmB0gHraY46v5eG79R2EyQ=='),
         },
+        'postgresql': {
+            'version': '11',
+        },
         'rspamd': {
             'password': vault.decrypt('encrypt$gAAAAABfp7qzym32R6Go1A6oax0NGQM7EBMckbEbnZC6-RSKx-klSJsL57XbSUTD-AJM-gBIPzlmor-3bfVxPWLRYXtO8uTVw6jNQ1yt15ReHkOTijVqV2ACk-LTDBG3p4YKBn0pQgNvvjXhWV_J1-Pgjywbl4sHXc0zqjCGZ6xtEn6ywj0Pd599JJjREF4QCIFVZVWuKvo1'),
         },

nodes/htz-cloud/pleroma.py

@@ -62,6 +62,9 @@ nodes['htz-cloud.pleroma'] = {
         'postfix': {
             'myhostname': 'cybert-media.net',
         },
+        'postgresql': {
+            'version': '11',
+        },
         'vm': {
             'cpu': 1,
             'ram': 2,

nodes/ovh/icinga2.py

@@ -118,6 +118,9 @@ nodes['ovh.icinga2'] = {
                 'xml',
             },
         },
+        'posgresql': {
+            'version': '11',
+        },
         'simple-icinga-dashboard': {
             'icinga2_api': {
                 'baseurl': 'https://127.0.0.1:5665',

nodes/voc/pretalx.py

@@ -70,6 +70,9 @@ nodes['voc.pretalx'] = {
             'myhostname': 'pretalx.c3voc.de',
             'relayhost': 'mng.c3voc.de',
         },
+        'postgresql': {
+            'version': '11',
+        },
     },
     'os': 'debian',
     'os_version': (10,),