From e909144544e1eaf4bf95854353cbd944eae4ceda Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 27 Feb 2022 12:51:53 +0100 Subject: [PATCH] bw/bundles/postgresql: do not auto-detect postgresql version from debian version --- bundles/postgresql/metadata.py | 12 ++---------- nodes/gce/bind01.py | 3 +++ nodes/gce/dns02.py | 3 +++ nodes/gce/dns03.py | 3 +++ nodes/home/paperless-sophie.py | 3 +++ nodes/home/paperless.py | 3 +++ nodes/htz-cloud/luther.py | 1 + nodes/htz-cloud/pirmasens.py | 3 +++ nodes/htz-cloud/pleroma.py | 3 +++ nodes/ovh/icinga2.py | 3 +++ nodes/voc/pretalx.py | 3 +++ 11 files changed, 30 insertions(+), 10 deletions(-) diff --git a/bundles/postgresql/metadata.py b/bundles/postgresql/metadata.py index bc9278e..fce9bb6 100644 --- a/bundles/postgresql/metadata.py +++ b/bundles/postgresql/metadata.py @@ -70,7 +70,6 @@ else: @metadata_reactor.provides( 'apt/repos/postgresql', - 'postgresql/version', ) def default_postgresql_version_for_debian(metadata): # @@ -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( diff --git a/nodes/gce/bind01.py b/nodes/gce/bind01.py index e6de7ef..26e52ad 100644 --- a/nodes/gce/bind01.py +++ b/nodes/gce/bind01.py @@ -43,6 +43,9 @@ nodes['gce.bind01'] = { }, }, }, + 'postgresql': { + 'version': '11', + }, 'powerdns': { 'is_secondary': False, 'secondary_nameservers': 'dns', diff --git a/nodes/gce/dns02.py b/nodes/gce/dns02.py index ddf28bc..def2765 100644 --- a/nodes/gce/dns02.py +++ b/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', }, diff --git a/nodes/gce/dns03.py b/nodes/gce/dns03.py index 3e86f4f..6f9c08e 100644 --- a/nodes/gce/dns03.py +++ b/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', diff --git a/nodes/home/paperless-sophie.py b/nodes/home/paperless-sophie.py index dab7b46..929bd24 100644 --- a/nodes/home/paperless-sophie.py +++ b/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, diff --git a/nodes/home/paperless.py b/nodes/home/paperless.py index c06db1c..3dd957e 100644 --- a/nodes/home/paperless.py +++ b/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, diff --git a/nodes/htz-cloud/luther.py b/nodes/htz-cloud/luther.py index 4da6360..f5e2b1e 100644 --- a/nodes/htz-cloud/luther.py +++ b/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 diff --git a/nodes/htz-cloud/pirmasens.py b/nodes/htz-cloud/pirmasens.py index 0e1af67..20d88f2 100644 --- a/nodes/htz-cloud/pirmasens.py +++ b/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'), }, diff --git a/nodes/htz-cloud/pleroma.py b/nodes/htz-cloud/pleroma.py index 3d620f0..e9ec7ef 100644 --- a/nodes/htz-cloud/pleroma.py +++ b/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, diff --git a/nodes/ovh/icinga2.py b/nodes/ovh/icinga2.py index 222f821..1f35845 100644 --- a/nodes/ovh/icinga2.py +++ b/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', diff --git a/nodes/voc/pretalx.py b/nodes/voc/pretalx.py index a1ad147..dc8488e 100644 --- a/nodes/voc/pretalx.py +++ b/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,),