Merge pull request #2112 from nextcloud/fix/sury-repokey-not-updated

Fix/sury repokey not updated

Author: theCalcaholic

lamp.sh

@@ -26,8 +26,9 @@ install()
 {
     set -x
     # Setup apt repository for php 8
-    wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-    echo "deb https://packages.sury.org/php/ ${RELEASE%-security} main" > /etc/apt/sources.list.d/php.list
+    wget -O /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+    dpkg -i /tmp/debsuryorg-archive-keyring.deb
+    echo "deb [signed-by=/usr/share/keyrings/debsuryorg-archive-keyring.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
     apt-get update
     $APTINSTALL apt-utils cron curl
     ls -l /var/lock || true

updates/1.57.0.sh

@@ -4,10 +4,22 @@ set -eu
 
 source /usr/local/etc/library.sh
 
+apt-get update
+
+if [[ ! -e /usr/share/keyrings/debsuryorg-archive-keyring.gpg ]]
+then
+  echo "Setup sury package repository key"
+  curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+  dpkg -i /tmp/debsuryorg-archive-keyring.deb
+  echo "deb [signed-by=/usr/share/keyrings/debsuryorg-archive-keyring.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
+  apt-get update
+
+  echo "done."
+fi
+
 echo "Configuring serverid ..."
 ncc config:system:get serverid > /dev/null || ncc config:system:set serverid --value="$((RANDOM % 1024))" --type=integer
 echo "Installing PHP APCU ..."
-apt-get update
 apt-get install -y php${PHPVER}-apcu
 echo "Enable apache2 remoteip"
 a2enmod remoteip

updates/1.57.1.sh

@@ -4,4 +4,17 @@ set -eu
 source /usr/local/etc/library.sh
 
 echo "Reconfigure automatic preview generation (if enabled)"
-run_app nc-previews-auto
+run_app nc-previews-auto
+echo "done."
+
+if [[ ! -e /usr/share/keyrings/debsuryorg-archive-keyring.gpg ]]
+then
+  echo "Setup sury package repository key"
+  apt-get update
+  curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+  dpkg -i /tmp/debsuryorg-archive-keyring.deb
+  echo "deb [signed-by=/usr/share/keyrings/debsuryorg-archive-keyring.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
+  apt-get update
+
+  echo "done."
+fi