From 4300e30d78cd3f8b103a15eac0aa6dfc157e230f Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Sat, 31 Jul 2021 20:38:07 -0600
Subject: unattended-upgrades: update raspbian origins

Signed-off-by: nachoparker <nacho@ownyourbits.com>
---
 bin/ncp/UPDATES/unattended-upgrades.sh |  2 +-
 changelog.md                           |  4 +++-
 updates/1.37.0.sh                      | 38 ----------------------------------
 updates/1.38.0.sh                      | 38 ++++++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 40 deletions(-)
 delete mode 100644 updates/1.37.0.sh
 create mode 100644 updates/1.38.0.sh

diff --git a/bin/ncp/UPDATES/unattended-upgrades.sh b/bin/ncp/UPDATES/unattended-upgrades.sh
index aab450a1..df4ec8bb 100644
--- a/bin/ncp/UPDATES/unattended-upgrades.sh
+++ b/bin/ncp/UPDATES/unattended-upgrades.sh
@@ -33,7 +33,7 @@ Unattended-Upgrade::Automatic-Reboot-Time "04:00";
 Unattended-Upgrade::Origins-Pattern {
 o=Debian,n=$RELEASE;
 o=deb.sury.org,n=$RELEASE;
-o="Raspbian",n=$RELEASE;
+o="Raspberry Pi Foundation",n=$RELEASE;
 }
 Dpkg::Options {
    "--force-confdef";
diff --git a/changelog.md b/changelog.md
index b6e9f64b..136791cc 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
 
-[v1.37.1](https://github.com/nextcloud/nextcloudpi/commit/0a0cc5a) (2021-07-06) ncp-app: bump to NC21
+[v1.37.2](https://github.com/nextcloud/nextcloudpi/commit/637ccfe) (2021-07-31) unattended-upgrades: update raspbian origins
+
+[v1.37.1 ](https://github.com/nextcloud/nextcloudpi/commit/b1ffd70) (2021-07-06) ncp-app: bump to NC21
 
 [v1.37.0 ](https://github.com/nextcloud/nextcloudpi/commit/effdd6c) (2021-07-03) upgrade to NC20.0.11
 
diff --git a/updates/1.37.0.sh b/updates/1.37.0.sh
deleted file mode 100644
index da5d63fe..00000000
--- a/updates/1.37.0.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-set -e
-
-## BACKWARD FIXES ( for older images )
-
-source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE
-
-# all images
-
-## fix raspbian origin
-is_active_app unattended-upgrades && run_app unattended-upgrades
-
-## reduce cron interval to 5 minutes
-crontab_tmp=$(mktemp -u -t crontab-www.XXXXXX)
-echo "*/5  *  *  *  * php -f /var/www/nextcloud/cron.php" > "${crontab_tmp}"
-crontab -u www-data "${crontab_tmp}"
-rm "${crontab_tmp}"
-
-
-# docker images only
-[[ -f /.docker-image ]] && {
-  # fix build bug on v1.32.0
-  grep -q 'data-ro' /data/nextcloud/config/config.php && cp -raTn /data-ro/nextcloud /data/nextcloud
-  sed -i 's|data-ro|data|' /data/nextcloud/config/config.php
-  :
-}
-
-# for non docker images
-[[ ! -f /.docker-image ]] && {
-  :
-}
-
-## enable TLSv1.3
-sed -i 's|SSLProtocol -all.*|SSLProtocol -all +TLSv1.2 +TLSv1.3|' /etc/apache2/conf-available/http2.conf
-bash -c "sleep 2 && service apache2 reload" &>/dev/null &
-
-exit 0
diff --git a/updates/1.38.0.sh b/updates/1.38.0.sh
new file mode 100644
index 00000000..da5d63fe
--- /dev/null
+++ b/updates/1.38.0.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -e
+
+## BACKWARD FIXES ( for older images )
+
+source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE
+
+# all images
+
+## fix raspbian origin
+is_active_app unattended-upgrades && run_app unattended-upgrades
+
+## reduce cron interval to 5 minutes
+crontab_tmp=$(mktemp -u -t crontab-www.XXXXXX)
+echo "*/5  *  *  *  * php -f /var/www/nextcloud/cron.php" > "${crontab_tmp}"
+crontab -u www-data "${crontab_tmp}"
+rm "${crontab_tmp}"
+
+
+# docker images only
+[[ -f /.docker-image ]] && {
+  # fix build bug on v1.32.0
+  grep -q 'data-ro' /data/nextcloud/config/config.php && cp -raTn /data-ro/nextcloud /data/nextcloud
+  sed -i 's|data-ro|data|' /data/nextcloud/config/config.php
+  :
+}
+
+# for non docker images
+[[ ! -f /.docker-image ]] && {
+  :
+}
+
+## enable TLSv1.3
+sed -i 's|SSLProtocol -all.*|SSLProtocol -all +TLSv1.2 +TLSv1.3|' /etc/apache2/conf-available/http2.conf
+bash -c "sleep 2 && service apache2 reload" &>/dev/null &
+
+exit 0
-- 
cgit v1.2.3