From b0dfc9fb478568c44d92b70bec5bdf49edb7d089 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 21 Sep 2023 14:55:41 -0600 Subject: [PATCH] Simplify PostgreSQL repo --- debian/resources/postgresql.sh | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/debian/resources/postgresql.sh b/debian/resources/postgresql.sh index 68f45a0..29cb7c5 100755 --- a/debian/resources/postgresql.sh +++ b/debian/resources/postgresql.sh @@ -28,31 +28,9 @@ fi #postgres official repository if [ ."$database_repo" = ."official" ]; then - if [ ."$os_codename" = ."jessie" ]; then - echo "deb http://apt.postgresql.org/pub/repos/apt/ $os_codename-pgdg main" > /etc/apt/sources.list.d/postgresql.list - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - - apt-get update && apt-get upgrade -y - fi - if [ ."$os_codename" = ."stretch" ]; then - echo "deb http://apt.postgresql.org/pub/repos/apt/ $os_codename-pgdg main" > /etc/apt/sources.list.d/postgresql.list - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - - apt-get update && apt-get upgrade -y - fi - if [ ."$os_codename" = ."buster" ]; then - echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/postgresql.list - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - - apt-get update && apt-get upgrade -y - fi - if [ ."$os_codename" = ."bullseye" ]; then - sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/pgdg.gpg - apt-get update && apt-get upgrade -y - fi - if [ ."$os_codename" = ."bookworm" ]; then - sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/pgdg.gpg - apt-get update && apt-get upgrade -y - fi + sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' + wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/pgdg.gpg + apt-get update && apt-get upgrade -y if [ ."$database_host" = ."127.0.0.1" ] || [ ."$database_host" = ."::1" ] ; then if [ ."$database_version" = ."latest" ]; then apt-get install -y sudo postgresql