From 44318812c10cb552eedc94fe102d903ca6eb7121 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 21 Sep 2023 13:23:11 -0600 Subject: [PATCH] Use keyring for PostgreSQL on Debian 11 and 12 --- debian/resources/postgresql.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/resources/postgresql.sh b/debian/resources/postgresql.sh index 122d180..930b302 100755 --- a/debian/resources/postgresql.sh +++ b/debian/resources/postgresql.sh @@ -44,13 +44,13 @@ if [ ."$database_repo" = ."official" ]; then apt-get update && apt-get upgrade -y fi if [ ."$os_codename" = ."bullseye" ]; then - echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/postgresql.list - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - + sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/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 /usr/share/keyrings/pgdg.gpg apt-get update && apt-get upgrade -y fi if [ ."$os_codename" = ."bookworm" ]; then - echo "deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main" > /etc/apt/sources.list.d/postgresql.list - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - + sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/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 /usr/share/keyrings/pgdg.gpg apt-get update && apt-get upgrade -y fi if [ ."$database_host" = ."127.0.0.1" ] || [ ."$database_host" = ."::1" ] ; then