From 272a11f7d3ad094f6bc8bc10e56955cc43115452 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Fri, 14 Jul 2023 06:33:59 +0200
Subject: [PATCH] bundles/postgresql: remove version-specific options

---
 bundles/postgresql/files/postgresql.conf | 2 --
 bundles/postgresql/items.py              | 7 ++-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/bundles/postgresql/files/postgresql.conf b/bundles/postgresql/files/postgresql.conf
index 2392466..0996a13 100644
--- a/bundles/postgresql/files/postgresql.conf
+++ b/bundles/postgresql/files/postgresql.conf
@@ -27,7 +27,5 @@ log_min_duration_statement = -1
 % endif
 effective_io_concurrency = ${effective_io_concurrency}
 max_worker_processes = ${max_worker_processes}
-% if version >= 10:
 max_parallel_workers = ${max_parallel_workers}
-% endif
 max_parallel_workers_per_gather = ${max_parallel_workers_per_gather}
diff --git a/bundles/postgresql/items.py b/bundles/postgresql/items.py
index 83754e4..f9cdc46 100644
--- a/bundles/postgresql/items.py
+++ b/bundles/postgresql/items.py
@@ -1,4 +1,4 @@
-postgresql_version = node.metadata['postgresql']['version']
+postgresql_version = int(node.metadata.get('postgresql/version'))
 
 pkg_apt = {
     'postgresql-common': {},
@@ -44,10 +44,7 @@ files = {
     },
     "/etc/postgresql/{}/main/postgresql.conf".format(postgresql_version): {
         'content_type': 'mako',
-        'context': {
-            'version': postgresql_version,
-            **node.metadata['postgresql'],
-        },
+        'context': node.metadata.get('postgresql'),
         'owner': 'postgres',
         'group': 'postgres',
         'needs': {