update to Debian 11 Bullseye

Signed-off-by: nachoparker <nacho@ownyourbits.com>

README.md

@@ -18,7 +18,7 @@ Find the full documentation at [docs.nextcloudpi.com](http://docs.nextcloudpi.co
  * Debian/Raspbian 10 Buster
  * Nextcloud 22.2.2
  * Apache 2.4.25, with HTTP2 enabled
- * PHP 7.3
+ * PHP 7.4
  * MariaDB 10
  * Redis memory cache
  * ncp-config for easy setup ( RAM logs, USB drive and more )

bin/ncp-diag

@@ -56,7 +56,7 @@ fi
 # Services
 echo "HTTPD service|$( pgrep -c apache2 &>/dev/null && echo up || echo down )"
 echo "PHP service|$( pgrep -c php-fpm &>/dev/null && echo up || echo down )"
-echo "MariaDB service|$( pgrep -c mysqld &>/dev/null && echo up || echo down )"
+echo "MariaDB service|$( (pgrep -c mysqld || pgrep -c mariadb) &>/dev/null && echo up || echo down )"
 echo "Redis service|$( pgrep -c redis-server &>/dev/null && echo up || echo down )"
 echo "HPB service|$( ncc notify_push:self-test &>/dev/null && echo up || echo down )"
 echo "Postfix service|$( pgrep -fc postfix &>/dev/null && echo up || echo down )"

bin/ncp-dist-upgrade

@@ -42,12 +42,15 @@ apt-get purge -y php${PHPVER} php${PHPVER}-curl php${PHPVER}-gd php${PHPVER}-fpm
 apt-get purge -y php${PHPVER}-mysql
 apt-get purge -y php${PHPVER}-redis
 apt-get purge -y php${PHPVER}-exif
+apt-get purge -y php${PHPVER}-bcmath
+apt-get purge -y php${PHPVER}-gmp
 apt-get purge -y php${PHPVER}-imagick
 set -e
 
 # update sources
-sed -i 's/stretch/buster/g' /etc/apt/sources.list
-sed -i 's/stretch/buster/g' /etc/apt/sources.list.d/*
+sed -i 's/buster/bullseye/g' /etc/apt/sources.list
+sed -i 's/buster/bullseye/g' /etc/apt/sources.list.d/* || true
+sed -i 's/bullseye\/updates/bullseye-security/g' /etc/apt/sources.list
 rm -f /etc/apt/sources.list.d/php.list
 
 # install latest distro
@@ -56,6 +59,8 @@ apt-get dist-upgrade -y
 
 # install latest PHP version
 release_new=$(jq -r '.release'     < "${new_cfg}")
+# the default repo in bullseye is bullseye-security
+release_new="${release_new}-security"
 php_ver_new=$(jq -r '.php_version' < "${new_cfg}")
 
 $APTINSTALL -t ${release_new} php${php_ver_new} php${php_ver_new}-curl php${php_ver_new}-gd php${php_ver_new}-fpm php${php_ver_new}-cli php${php_ver_new}-opcache \
@@ -65,8 +70,13 @@ $APTINSTALL -t ${release_new} php${php_ver_new} php${php_ver_new}-curl php${php_
 $APTINSTALL php${php_ver_new}-mysql
 $APTINSTALL -t ${release_new} php${php_ver_new}-redis
 
-$APTINSTALL -t ${release_new} php-smbclient exfat-fuse exfat-utils
+$APTINSTALL -t ${release_new} smbclient exfat-fuse exfat-utils
+sleep 2 # avoid systemd thinking that PHP is in a crash/restart loop
 $APTINSTALL -t ${release_new} php${php_ver_new}-exif
+sleep 2 # avoid systemd thinking that PHP is in a crash/restart loop
+$APTINSTALL -t ${release_new} php${php_ver_new}-bcmath
+sleep 2 # avoid systemd thinking that PHP is in a crash/restart loop
+$APTINSTALL -t ${release_new} php${php_ver_new}-gmp
 #$APTINSTALL -t ${release_new} imagemagick php${php_ver_new}-imagick ghostscript
 
 apt-get autoremove -y
@@ -114,6 +124,7 @@ is_active_app unattended-upgrades && run_app unattended-upgrades || true
 # mark as successful
 mv "${new_cfg}" "${old_cfg}"
 
+source /usr/local/etc/library.sh # refresh NCPCFG RELEASE PHPVER
 run_app nc-limits
 restore_maintenance_mode
 

bin/ncp/CONFIG/nc-datadir.sh

@@ -17,12 +17,11 @@ is_active()
 
 install()
 {
-  apt_install btrfs-tools
+  apt_install btrfs-progs
 }
 
 configure()
 {
-  source /usr/local/etc/library.sh # sets PHPVER
   set -eu -o pipefail
 
   ## CHECKS

bin/ncp/CONFIG/nc-init.sh

@@ -12,8 +12,6 @@ DBADMIN=ncadmin
 
 configure()
 {
-  source /usr/local/etc/library.sh # sets PHPVER NCVER
-
   echo "Setting up a clean Nextcloud instance... wait until message 'NC init done'"
 
   # checks
@@ -25,7 +23,7 @@ configure()
   echo "Setting up database..."
 
   # launch mariadb if not already running
-  if ! pgrep -c mysqld &>/dev/null; then
+  if ! [[ -f /run/mysqld/mysqld.pid ]]; then
     echo "Starting mariaDB"
     mysqld &
     local db_pid=$!
@@ -160,7 +158,9 @@ EOF
   fi
 
   # ncp-previewgenerator
-  if is_more_recent_than "21.0.0" "$NCVER"; then
+  local ncver
+  ncver="$(ncc status 2>/dev/null | grep "version:" | awk '{ print $3 }')"
+  if is_more_recent_than "21.0.0" "${ncver}"; then
     local ncprev=/var/www/ncp-previewgenerator/ncp-previewgenerator-nc20
   else
     ncc app:install notify_push
@@ -202,6 +202,7 @@ EOF
 
   # dettach mysql during the build
   if [[ "${db_pid}" != "" ]]; then
+    echo "Shutting down mariaDB (${db_pid})"
     mysqladmin -u root shutdown
     wait "${db_pid}"
   fi

bin/ncp/CONFIG/nc-limits.sh

@@ -10,8 +10,6 @@
 
 configure()
 {
-  source /usr/local/etc/library.sh # sets PHPVER
-
   # Set auto memory limit to 75% of the total memory
   local TOTAL_MEM="$( free -b | sed -n 2p | awk '{ print $2 }' )"
   AUTOMEM=$(( TOTAL_MEM * 75 / 100 ))
@@ -48,7 +46,7 @@ configure()
   echo "Using $AUTOMEM memory for the database"
   [[ "$CURRENT_DB_MEM" != "$AUTOMEM" ]] && {
     sed -i "s|^innodb_buffer_pool_size =.*|innodb_buffer_pool_size = $AUTOMEM|" "$CONF"
-    service mysql restart
+    service mariadb restart
   }
 
   # RESTART PHP

bin/ncp/CONFIG/nc-nextcloud.sh

@@ -22,10 +22,13 @@ install()
   # Optional packets for Nextcloud and Apps
   apt-get update
   $APTINSTALL lbzip2 iputils-ping jq wget
-  $APTINSTALL -t $RELEASE php-smbclient exfat-fuse exfat-utils                  # for external storage
+  # NOTE: php-smbclient in sury but not in Debian sources, we'll use the binary version
+  # https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/external_storage/smb.html
+  $APTINSTALL -t $RELEASE smbclient exfat-fuse exfat-utils                      # for external storage
+  $APTINSTALL -t $RELEASE exfat-fuse exfat-utils                                # for external storage
   $APTINSTALL -t $RELEASE php${PHPVER}-exif                                     # for gallery
+  $APTINSTALL -t $RELEASE php${PHPVER}-bcmath                                   # for LDAP
   $APTINSTALL -t $RELEASE php${PHPVER}-gmp                                      # for bookmarks
-  $APTINSTALL -t $RELEASE php-bcmath                                            # for LDAP
   #$APTINSTALL -t imagemagick php${PHPVER}-imagick ghostscript   # for gallery
 
 
@@ -149,15 +152,12 @@ configure()
 
   ## RE-CREATE DATABASE TABLE
   # launch mariadb if not already running (for docker build)
-  if ! pgrep -c mysqld &>/dev/null; then
+  if ! [[ -f /run/mysqld/mysqld.pid ]]; then
     echo "Starting mariaDB"
     mysqld &
     local db_pid=$!
   fi
 
-  # wait for mariadb
-  pgrep -x mysqld &>/dev/null || echo "mariaDB process not found"
-
   while :; do
     [[ -S /var/run/mysqld/mysqld.sock ]] && break
     sleep 0.5
@@ -260,6 +260,7 @@ EOF
 
   # dettach mysql during the build
   if [[ "${db_pid}" != "" ]]; then
+    echo "Shutting down mariaDB (${db_pid})"
     mysqladmin -u root shutdown
     wait "${db_pid}"
   fi

bin/ncp/NETWORKING/nc-static-IP.sh

@@ -8,8 +8,6 @@
 # More at: https://ownyourbits.com
 #
 
-source /usr/local/etc/library.sh
-
 configure() 
 {
   local GW="$( ip r | grep "default via"   | awk '{ print $3 }' | head -1 )"

bin/ncp/SYSTEM/nc-hdd-monitor.sh

@@ -24,8 +24,7 @@ configure()
   }
 
   [[ "$ACTIVE" != yes ]] && {
-    systemctl disable smartd
-    service smartd stop
+    systemctl disable --now smartd
     echo "HDD monitor disabled"
     return 0
   }
@@ -70,8 +69,7 @@ EOF
 
   done
 
-  systemctl enable smartd
-  service smartd start
+  systemctl enable --now smartd
   echo "HDD monitor enabled"
 }
 

bin/ncp/SYSTEM/nc-hdd-test.sh

@@ -12,12 +12,8 @@
 
 install()
 {
-  apt-get update
-  apt-get install --no-install-recommends -y smartmontools
-  [[ "$DOCKERBUILD" == 1 ]] || {
-    systemctl disable smartd
-    systemctl stop smartd
-  }
+  apt_install smartmontools
+  systemctl disable smartd
   return
 }
 

bin/ncp/UPDATES/nc-autoupdate-nc.sh

@@ -9,7 +9,6 @@
 #
 
 # just change NCLATESTVER and re-activate in update.sh to upgrade users
-source /usr/local/etc/library.sh # sets NCLATESTVER
 
 configure()
 {

bin/ncp/UPDATES/nc-update-nextcloud.sh

@@ -8,7 +8,6 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
-source /usr/local/etc/library.sh # sets NCLATESTVER
 LATEST="$NCLATESTVER"
 
 configure()

bin/ncp/UPDATES/unattended-upgrades.sh

@@ -18,8 +18,6 @@ install()
 
 configure()
 {
-  source /usr/local/etc/library.sh # sets RELEASE
-
   [[ $ACTIVE     == "yes" ]] && local AUTOUPGRADE=1   || local AUTOUPGRADE=0
   [[ $AUTOREBOOT == "yes" ]] && local AUTOREBOOT=true || local AUTOREBOOT=false
 

build/armbian/armbian.sh

@@ -21,8 +21,6 @@ cd /tmp/overlay
 NCPCFG=etc/ncp.cfg
 source etc/library.sh # sets RELEASE
 
-[[ "$ARMBIAN_RELEASE" != "$RELEASE" ]] && { echo "Only $RELEASE is supported by NextCloudPi" >&2; exit 1; }
-
 # need sudo access that does not expire during build
 chage -d -1 root
 

build/batch.sh

@@ -55,6 +55,7 @@ IMG="$(ls -1t tmp/*.img | head -1)"
 build/build-SD-berryboot.sh "$IMG"
 
 # Armbian
+export LIB_TAG=master # if we want to pin down a specific armbian version
 build/build-SD-armbian.sh odroidxu4 OdroidHC2
 build/build-SD-armbian.sh rockpro64 RockPro64
 build/build-SD-armbian.sh rock64 Rock64

build/build-LXD.sh

@@ -32,7 +32,7 @@ prepare_dirs                   # tmp cache output
 ## BUILD NCP
 
 lxc delete -f ncp 2>/dev/null || true
-systemd-run --user --scope -p "Delegate=yes" lxc launch images:debian/buster ncp
+systemd-run --user --scope -p "Delegate=yes" lxc launch images:debian/bullseye ncp
 lxc config device add ncp buildcode disk source="$(pwd)" path=/build
 lxc exec ncp -- bash -c 'while [ "$(systemctl is-system-running 2>/dev/null)" != "running" ] && [ "$(systemctl is-system-running 2>/dev/null)" != "degraded" ]; do :; done'
 lxc exec ncp -- bash -c 'CODE_DIR=/build bash /build/install.sh'

build/build-SD-armbian.sh

@@ -46,10 +46,10 @@ CONF=armbian/userpatches/config-ncp.conf
 # default parameters
 cat > "$CONF" <<EOF
 BOARD="$BOARD"
-BRANCH=legacy
-RELEASE=$RELEASE
+BRANCH=current
+RELEASE=${RELEASE%%-security}
 KERNEL_ONLY=no
-KERNEL_CONFIGURE=no
+KERNEL_CONFIGURE=prebuilt
 BUILD_DESKTOP=no
 BUILD_MINIMAL=yes
 USE_CCACHE=yes

build/build-SD-rpi.sh

@@ -13,7 +13,7 @@ source build/buildlib.sh
 
 echo -e "\e[1m\n[ Build NCP Raspberry Pi ]\e[0m"
 
-URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2021-11-08/2021-10-30-raspios-bullseye-arm64-lite.zip"
+URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2022-01-28/2022-01-28-raspios-bullseye-arm64-lite.zip"
 SIZE=4G                     # Raspbian image size
 #CLEAN=0                    # Pass this envvar to skip cleaning download cache
 IMG="NextCloudPi_RPi_$( date  "+%m-%d-%y" ).img"
@@ -61,6 +61,9 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
     #$APTINSTALL rpi-update
     #echo -e "y\n" | PRUNE_MODULES=1 rpi-update
 
+    # this image comes without resolv.conf ??
+    echo 'nameserver 1.1.1.1' >> /etc/resolv.conf
+
     # install NCP
     cd /tmp/ncp-build || exit 1
     CODE_DIR="$(pwd)" bash install.sh
@@ -82,8 +85,9 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
     cfg="$(jq '.params[3].value = "raspberry"' <<<"$cfg")"
     echo "$cfg" > /usr/local/etc/ncp-config.d/SSH.cfg
 
-    $ cleanup
+    # cleanup
     source etc/library.sh && run_app_unsafe post-inst.sh
+    rm /etc/resolv.conf
     rm -rf /tmp/ncp-build
 EOFCHROOT
 

build/build-docker.sh

@@ -20,10 +20,10 @@ function build_arch()
 
   echo -e "\e[1m\n[ Build NCP Docker ${arch} ]\e[0m"
 
-  docker_build -f build/docker/debian-ncp/Dockerfile  -t ownyourbits/debian-ncp-${ncp_tag}:latest --pull --build-arg release=${release} --build-arg arch=${arch} --build-arg arch_qemu=${arch_qemu}
-  docker_build -f build/docker/lamp/Dockerfile        -t ownyourbits/lamp-${ncp_tag}:latest              --build-arg release=${release} --build-arg arch=${ncp_tag}
-  docker_build -f build/docker/nextcloud/Dockerfile   -t ownyourbits/nextcloud-${ncp_tag}:latest         --build-arg release=${release} --build-arg arch=${ncp_tag}
-  docker_build -f build/docker/nextcloudpi/Dockerfile -t ownyourbits/nextcloudpi-${ncp_tag}:latest       --build-arg release=${release} --build-arg arch=${ncp_tag} --build-arg ncp_ver=${version}
+  docker_build -f build/docker/debian-ncp/Dockerfile  -t ownyourbits/debian-ncp-${ncp_tag}:latest --pull --build-arg release=${release} --build-arg arch=${arch}    --build-arg arch_qemu=${arch_qemu}
+  docker_build -f build/docker/lamp/Dockerfile        -t ownyourbits/lamp-${ncp_tag}:latest              --build-arg release=${release} --build-arg arch=${ncp_tag} --build-arg arch_qemu=${arch_qemu}
+  docker_build -f build/docker/nextcloud/Dockerfile   -t ownyourbits/nextcloud-${ncp_tag}:latest         --build-arg release=${release} --build-arg arch=${ncp_tag} --build-arg arch_qemu=${arch_qemu}
+  docker_build -f build/docker/nextcloudpi/Dockerfile -t ownyourbits/nextcloudpi-${ncp_tag}:latest       --build-arg release=${release} --build-arg arch=${ncp_tag} --build-arg arch_qemu=${arch_qemu} --build-arg ncp_ver=${version}
 
   docker tag ownyourbits/debian-ncp-${ncp_tag}:latest ownyourbits/debian-ncp-${ncp_tag}:"${version}"
   docker tag ownyourbits/lamp-${ncp_tag}:latest ownyourbits/lamp-${ncp_tag}:"${version}"