From: Marcin Godzina <mgodzina@isc.org>
Date: Mon, 20 May 2024 14:15:40 +0000 (+0000)
Subject: [#3418] remove os check before Postgres ddb grant
X-Git-Tag: Kea-2.6.0~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4500ae99b428ca13b682e8ac2ee3c8e60770a992;p=thirdparty%2Fkea.git

[#3418] remove os check before Postgres ddb grant
---

diff --git a/hammer.py b/hammer.py
index 584852c0c4..17182bef4a 100755
--- a/hammer.py
+++ b/hammer.py
@@ -1555,15 +1555,12 @@ def _configure_pgsql(system, revision, features):
     cmd += 'EOF\n"'
     execute(cmd, cwd='/tmp')
 
-    if system == 'fedora' and int(revision) >= 38 or \
-        system == 'debian' and int(revision) >= 12 or \
-        system == 'alpine' and float(revision) >= 3.17:
-        #TODO it needs detection of pgsql version, and apply this only for postgres >= 15
-        cmd = """bash -c \"cat <<EOF | sudo -u postgres psql postgres
-            GRANT ALL ON DATABASE keatest TO keatest;
-            ALTER DATABASE keatest OWNER TO keatest;\n"""
-        cmd += 'EOF\n"'
-        execute(cmd, cwd='/tmp')
+    # This is needed for postgres >= 15
+    cmd = """bash -c \"cat <<EOF | sudo -u postgres psql postgres
+        GRANT ALL ON DATABASE keatest TO keatest;
+        ALTER DATABASE keatest OWNER TO keatest;\n"""
+    cmd += 'EOF\n"'
+    execute(cmd, cwd='/tmp')
 
     cmd = """bash -c \"cat <<EOF | sudo -u postgres psql -U keatest keatest
         ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO keatest_readonly;\n"""