dietpi-software: implement ownCloud Infinite Scale

Author: MichaIng

.github/workflows/dietpi-software.bash

@@ -143,7 +143,7 @@ Process_Software()
 			44) aSERVICES[i]='transmission-daemon' aTCP[i]='9091 51413' aUDP[i]='51413';;
 			45) aSERVICES[i]='deluged deluge-web' aTCP[i]='8112 58846 6882';;
 			46) aSERVICES[i]='qbittorrent' aTCP[i]='1340 6881';;
-			47) aCOMMANDS[i]='sudo -u www-data php /var/www/owncloud/occ status';;
+			47) aSERVICES[i]='ocis' aTCP[i]='9200';;
 			#48) Pydio
 			49) aSERVICES[i]='gogs' aTCP[i]='3000';;
 			50) aSERVICES[i]='syncthing' aTCP[i]='8384';;

.github/workflows/update_urls.bash

@@ -64,6 +64,13 @@ aARCH[$software_id]='armhf arm64 amd64'
 aARCH_CHECK[$software_id]='riscv64'
 aREGEX[$software_id]='https://github.com/MediaBrowser/Emby.Releases/releases/download/.*/emby-server-deb_.*_\$arch.deb'
 
+# ownCloud Infinite Scale
+software_id=47
+aCHECK[$software_id]='curl -sSfL '\''https://api.github.com/repos/owncloud/ocis/releases/latest'\'' | mawk -F\" "/^ *\"browser_download_url\": \".*\/ocis-[^\"\/]*-linux-$arch\"$/{print \$4}"'
+aARCH[$software_id]='arm arm64 amd64'
+aARCH_CHECK[$software_id]='riscv64'
+aREGEX[$software_id]='https://github.com/owncloud/ocis/releases/download/.*/ocis-.*-linux-\$arch'
+
 # Gogs
 software_id=49
 aCHECK[$software_id]='curl -sSf '\''https://api.github.com/repos/gogs/gogs/releases/latest'\'' | mawk -F\" "/^ *\"browser_download_url\": \".*\/gogs_[^\"\/]*_linux_$arch.tar.gz\"$/{print \$4}"'

.update/patches

@@ -2161,7 +2161,31 @@ Patch_9_20()
 			G_DIETPI-NOTIFY 2 'Scheduling Allo GUI update to latest version'
 			G_EXEC eval 'echo 160 >> /var/tmp/dietpi/dietpi-update_reinstalls'
 		fi
+	fi
+
+	# RPi firmware migration: Do after all other patches
+	if (( $G_HW_MODEL < 10 )) && ! dpkg-query -s 'raspi-firmware' &> /dev/null
+	then
+		G_WHIP_MSG '[ INFO ] Raspberry Pi kernel/firmware migration will be applied
+\nA migration to the new RPi Linux 6.12+ kernel and firmware stack will be applied. Please report any error at our forum or GitHub. The DietPi update will finish in any case, and you can retry the migration with:
+$ /boot/dietpi/func/dietpi-set_software rpi_firmware_migration'
+		G_EXEC_OUTPUT=1 G_EXEC /boot/dietpi/func/dietpi-set_software rpi_firmware_migration
+	fi
+}
 
+Patch_10_0()
+{
+	# dietpi.txt migration
+	if grep -q '^[[:blank:]]*SOFTWARE_OWNCLOUD_NEXTCLOUD_USERNAME=' /boot/dietpi.txt
+	then
+		G_EXEC sed --follow-symlinks -i '/^[[:blank:]]*SOFTWARE_NEXTCLOUD_USERNAME=/d' /boot/dietpi.txt
+		G_EXEC sed --follow-symlinks -i 's/SOFTWARE_OWNCLOUD_NEXTCLOUD_USERNAME=/SOFTWARE_NEXTCLOUD_USERNAME=/' /boot/dietpi.txt
+	fi
+	G_EXEC sed --follow-symlinks -i '/^[[:blank:]]*SOFTWARE_OWNCLOUD_DATADIR=/d' /boot/dietpi.txt
+
+	# Software updates, migrations and patches
+	if [[ -f '/boot/dietpi/.installed' ]]
+	then
 		# Pi-hole v6 migration
 		# - /etc/pihole/pihole.toml indicates that Pi-hole has been upgraded to v6 already.
 		# - The /var/www/pihole symlink indicates that an instance installed via dietpi-software has not been migrated yet.
@@ -2216,15 +2240,6 @@ Patch_9_20()
 			fi
 		fi
 	fi
-
-	# RPi firmware migration: Do after all other patches
-	if (( $G_HW_MODEL < 10 )) && ! dpkg-query -s 'raspi-firmware' &> /dev/null
-	then
-		G_WHIP_MSG '[ INFO ] Raspberry Pi kernel/firmware migration will be applied
-\nA migration to the new RPi Linux 6.12+ kernel and firmware stack will be applied. Please report any error at our forum or GitHub. The DietPi update will finish in any case, and you can retry the migration with:
-$ /boot/dietpi/func/dietpi-set_software rpi_firmware_migration'
-		G_EXEC_OUTPUT=1 G_EXEC /boot/dietpi/func/dietpi-set_software rpi_firmware_migration
-	fi
 }
 
 # Failsafe: Error out on invalid version

CHANGELOG.txt

@@ -5,11 +5,15 @@ Breaking:
 - The minimum Debian version supported by our scripts has been raised to Debian 12 Bookworm. Debian 11 Bullseye systems will be migrated to a dedicated branch automatically. We highly recommend to upgrade affected systems to Debian 12 Bookworm, following our guide: https://dietpi.com/blog/?p=3128. Once the upgrade has been done, the update to DietPi v10 will be offered on next update check or when running "dietpi-update".
 - The minimum DietPi version to support direct updates to DietPi v10 from has been raised to v8.0. Older systems will go through a two-stage process, being upgraded to DietPi v9.20 on a separate branch, and afterwards further to DietPi v10 via master branch, if the Debian version requirement is met as well.
 
+New software:
+- ownCloud Infinite Scale | This successor of the classic ownCloud file sync and share platform has been added to our software catalogue.
+
 Removed SBC support:
 - The removed of support for Debian 11 Bullseye implies the removal of support for the Sparky SBC, NanoPi M2/T2/Fire2, and NanoPi M3/T3/Fire3 families. Images for those SBCs ship with very old vendor Linux versions, which cannot run Debian 13 Trixie. They already had issues which Debian 12 Bookworm, which is the reason we provided only Bullseye images for them. If anyone finds functional mainline-based Linux and U-Boot sources, or is able to rebase the needed drivers and device trees, we are happy to re-implement support.
 
 Removed software:
-- The removal of support for Debian 11 Bullseye implies the removal of the RPi Cam Web Interface software option. This depends on the legacy MMAL camera interface, while the related userspace libraries have been removed from the Bookworm packages of the Raspberry Pi repository. Maintenance for this project stalled since several years, and there is no active fork. We are focusing on motionEye and mjpg-streamer as generic camera and motion detection web interfaces, which both support libcamera indirectly via libcamerify, and have native support in view.
+- The removal of support for Debian 11 Bullseye implies the removal of the RPi Cam Web Interface software option. It depends on the legacy MMAL camera interface, while the related userspace libraries have been removed from the Bookworm packages of the Raspberry Pi repository. Maintenance for this project stalled since several years, and there is no active fork. We are focusing on motionEye and mjpg-streamer as generic camera and motion detection web interfaces, which both support libcamera indirectly via libcamerify, and have native support in view.
+- The removal of support for Debian 11 Bullseye implies the removal of the classic ownCloud software option. It does not support PHP 8.x, and development stalled. Instead we integrated support for the actively developed ownCloud Infinite Scale (see above), and a migration to Nextcloud is alternatively possible.
 
 Enhancement:
 

README.md

@@ -227,7 +227,7 @@ Links to hardware and software manufacturers, sources and build instructions use
 - [ruTorrent](https://github.com/Novik/ruTorrent)
 - [qBittorrent](https://github.com/qbittorrent/qBittorrent)
 - [Nextcloud](https://github.com/nextcloud/server)
-- [ownCloud](https://github.com/owncloud/core)
+- [ownCloud Infinite Scale](https://github.com/owncloud/ocis)
 - [Syncthing](https://github.com/syncthing/syncthing)
 - [ReadyMedia](https://sourceforge.net/p/minidlna/git/ci/master/tree/)
 - [MPD](https://github.com/MusicPlayerDaemon/MPD)

dietpi.txt

@@ -267,11 +267,10 @@ SOFTWARE_VNCSERVER_DEPTH=16
 SOFTWARE_VNCSERVER_DISPLAY_INDEX=1
 SOFTWARE_VNCSERVER_SHARE_DESKTOP=0
 
-# ownCloud/Nextcloud
-# - Optional username for admin account, the default is 'admin', applied during install
-SOFTWARE_OWNCLOUD_NEXTCLOUD_USERNAME=admin
-# - Optional data directory, default is "/mnt/dietpi_userdata/owncloud_data" respectively "/mnt/dietpi_userdata/nextcloud_data", applied during install
-SOFTWARE_OWNCLOUD_DATADIR=/mnt/dietpi_userdata/owncloud_data
+# Nextcloud
+# - Optional username for admin account, the default is "admin", applied during install
+SOFTWARE_NEXTCLOUD_USERNAME=admin
+# - Optional data directory, default is "/mnt/dietpi_userdata/nextcloud_data", applied during install
 SOFTWARE_NEXTCLOUD_DATADIR=/mnt/dietpi_userdata/nextcloud_data
 
 # Synapse

dietpi/dietpi-services

@@ -209,6 +209,7 @@ _EOF_
 			'forgejo'
 			'vaultwarden'
 			'filebrowser'
+			'ocis'
 
 			# - Emulation/Gaming
 			'mineos'