Compare commits

..

No commits in common. "master" and "alpine-support" have entirely different histories.

View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2013-2020 ungleich glarus ag (cdist at ungleich.ch) # 2013-2019 ungleich glarus ag (cdist at ungleich.ch)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -24,10 +24,6 @@ os=$(cat $__global/explorer/os)
osversion=$(cat "$__global/explorer/os_version") osversion=$(cat "$__global/explorer/os_version")
case "$os" in case "$os" in
alpine)
postgres_lib="postgresql-dev"
postgres_server="postgresql"
;;
debian|devuan) debian|devuan)
postgres_lib=libpq-dev postgres_lib=libpq-dev
@ -44,9 +40,6 @@ case "$os" in
9*|ascii/ceres|ascii) 9*|ascii/ceres|ascii)
postgres_version=9.6 postgres_version=9.6
;; ;;
10*|11*|beowulf/ceres|beowulf)
postgres_version=11
;;
*) *)
echo "Unsupported OS Version: $osversion" >&2 echo "Unsupported OS Version: $osversion" >&2
exit 1 exit 1
@ -61,22 +54,10 @@ case "$os" in
postgres_server="postgresql-${postgres_version}" postgres_server="postgresql-${postgres_version}"
;; ;;
ubuntu) alpine)
postgres_lib=libpq-dev postgres_lib="postgresql-dev"
postgres_server="postgresql"
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 echo "Unsupported OS: $os" >&2
exit 1 exit 1