Fix/sury repokey not updated

etc/ncp-templates/cron.hourly/ncp-previewgenerator.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 cat <<'EOF'
+#!/usr/bin/env bash
+set -eu
+
 GENERATE_JOB_ID="ncp-generate-previews"
 
 if [[ "$(systemctl is-active "${GENERATE_JOB_ID}" ||:)" =~ ^(active|activating|deactivating)$ ]]
@@ -9,15 +12,13 @@ then
   exit 0
 fi
 
-#!/usr/bin/env bash
-set -eu
 source /usr/local/etc/library.sh
 
 if is_app_enabled memories
 then
-  ncc config:app:set --value="256 4096" previewgenerator coverWidthHeightSizes
+  ncc config:app:set --value="256 4096" previewgenerator coverWidthHeightSizes > /dev/null
 else
-  ncc config:app:set --value="" previewgenerator coverWidthHeightSizes
+  ncc config:app:set --value="" previewgenerator coverWidthHeightSizes > /dev/null
 fi
 
 for _ in $(seq 1 $(nproc)); do

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

ncp-web/ncp-launcher.php

@@ -16,6 +16,11 @@
 $l10nDir = "l10n";
 ignore_user_abort(true);
 
+function bash_escape_arg($arg): string
+{
+  return "'" . str_replace("'", "\\'", $arg) . "'";
+}
+
 //
 // language
 //
@@ -105,7 +110,7 @@
   echo ' "output": "" , ';
   echo ' "ret": ';
 
-  exec( 'bash -c "sudo /home/www/ncp-launcher.sh ' . $ncp_app . '"' , $output , $ret );
+  exec( 'bash -c "sudo /home/www/ncp-launcher.sh ' . bash_escape_arg($ncp_app) . '"' , $output , $ret );
   echo '"' . $ret . '" }';
 }
 
@@ -159,7 +164,7 @@
     exit('{ "output": "domain can\'t be empty", "ret": 1 }');
   }
   echo '{ "token": "' . getCSRFToken() . '",';               // Get new token
-  exec("/usr/bin/php /var/www/nextcloud/occ config:system:set overwrite.cli.url --value '" . $_POST['url'] . "'",
+  exec("/usr/bin/php /var/www/nextcloud/occ config:system:set overwrite.cli.url --value " . bash_escape_arg($_POST['url']),
       $out, $ret);
   echo  ' "out": "' . htmlspecialchars(join("\n", $out), ENT_QUOTES, "UTF-8") . '", ';
   echo  ' "ret": "' . $ret . '"}';

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

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -eu
+
+source /usr/local/etc/library.sh
+
+echo "Reconfigure automatic preview generation (if enabled)"
+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