From 3cf93249c38a6f27c097877add619b5d6499a049 Mon Sep 17 00:00:00 2001 From: Dennis Camera Date: Thu, 15 Apr 2021 16:55:11 +0200 Subject: [PATCH] [type/__postgres_extension] Include postgres_user explorer from __postgres_conf --- .../__postgres_extension/explorer/postgres_user | 1 + cdist/conf/type/__postgres_extension/gencode-remote | 13 +------------ 2 files changed, 2 insertions(+), 12 deletions(-) create mode 120000 cdist/conf/type/__postgres_extension/explorer/postgres_user diff --git a/cdist/conf/type/__postgres_extension/explorer/postgres_user b/cdist/conf/type/__postgres_extension/explorer/postgres_user new file mode 120000 index 00000000..714e7237 --- /dev/null +++ b/cdist/conf/type/__postgres_extension/explorer/postgres_user @@ -0,0 +1 @@ +../../__postgres_conf/explorer/postgres_user \ No newline at end of file diff --git a/cdist/conf/type/__postgres_extension/gencode-remote b/cdist/conf/type/__postgres_extension/gencode-remote index af9c97f1..a1c84828 100755 --- a/cdist/conf/type/__postgres_extension/gencode-remote +++ b/cdist/conf/type/__postgres_extension/gencode-remote @@ -22,18 +22,7 @@ # along with cdist. If not, see . # -case "$(cat "${__global}/explorer/os")" -in - netbsd) - postgres_user='pgsql' - ;; - openbsd) - postgres_user='_postgresql' - ;; - *) - postgres_user='postgres' - ;; -esac +postgres_user=$(cat "${__object:?}/explorer/postgres_user") dbname=$( echo "$__object_id" | cut -d":" -f1 )