From 9472a3447f620403f29dd81ad9d52a840b0d8a89 Mon Sep 17 00:00:00 2001 From: llnu Date: Tue, 14 Jan 2020 22:40:51 +0100 Subject: [PATCH 1/3] added support for beowulf/ceres --- manifest | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest b/manifest index 412a1d9..8eaf476 100644 --- a/manifest +++ b/manifest @@ -40,6 +40,9 @@ case "$os" in 9*|ascii/ceres|ascii) postgres_version=9.6 ;; + 11*|beowulf/ceres|beowulf) + postgres_version=11 + ;; *) echo "Unsupported OS Version: $osversion" >&2 exit 1 From 203d4557e776799659e10246593c64217168f68f Mon Sep 17 00:00:00 2001 From: llnu Date: Sun, 26 Apr 2020 16:42:14 +0200 Subject: [PATCH 2/3] [postgresql] added support for debian 10 --- manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest b/manifest index 8eaf476..737a5b6 100644 --- a/manifest +++ b/manifest @@ -40,7 +40,7 @@ case "$os" in 9*|ascii/ceres|ascii) postgres_version=9.6 ;; - 11*|beowulf/ceres|beowulf) + 10*|11*|beowulf/ceres|beowulf) postgres_version=11 ;; *) From c5154438e17db94550338e30f7d35125c4db1b7e Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 1 May 2020 15:36:20 +0200 Subject: [PATCH 3/3] Add support for ubuntu 20.04 --- manifest | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/manifest b/manifest index 737a5b6..007a16a 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ #!/bin/sh # -# 2013-2019 ungleich glarus ag (cdist at ungleich.ch) +# 2013-2020 ungleich glarus ag (cdist at ungleich.ch) # # This file is part of cdist. # @@ -24,6 +24,10 @@ os=$(cat $__global/explorer/os) osversion=$(cat "$__global/explorer/os_version") case "$os" in + alpine) + postgres_lib="postgresql-dev" + postgres_server="postgresql" + ;; debian|devuan) postgres_lib=libpq-dev @@ -57,10 +61,22 @@ case "$os" in postgres_server="postgresql-${postgres_version}" ;; - alpine) - postgres_lib="postgresql-dev" - postgres_server="postgresql" - ;; + ubuntu) + postgres_lib=libpq-dev + + case $osversion in + 20.04) + postgres_version=12 + ;; + *) + echo "Unsupported OS Version: $osversion" >&2 + exit 1 + ;; + esac + postgres_server="postgresql-${postgres_version}" + + ;; + *) echo "Unsupported OS: $os" >&2 exit 1