Skip to content

Commit 3468083

Browse files
committed
dietpi-software: Pydio: remove software option
1 parent 546200f commit 3468083

File tree

8 files changed

+6
-144
lines changed

8 files changed

+6
-144
lines changed

.conf/dps_48/apache.pydio.conf

Lines changed: 0 additions & 8 deletions
This file was deleted.

.conf/dps_48/lighttpd.pydio.conf

Lines changed: 0 additions & 13 deletions
This file was deleted.

.conf/dps_48/nginx.pydio.conf

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/workflows/dietpi-software.bash

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ Process_Software()
144144
45) aSERVICES[i]='deluged deluge-web' aTCP[i]='8112 58846 6882';;
145145
46) aSERVICES[i]='qbittorrent' aTCP[i]='1340 6881';;
146146
47) aSERVICES[i]='ocis' aTCP[i]='9200';;
147-
#48) Pydio
148147
49) aSERVICES[i]='gogs' aTCP[i]='3000';;
149148
50) aSERVICES[i]='syncthing' aTCP[i]='8384';;
150149
51) aCOMMANDS[i]='/usr/games/opentyrian/opentyrian -h';;

.meta/dietpi-survey_report

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ shopt -s extglob # +(expr) syntax
589589
done
590590
unset -v 'aSOFTWARE_NAME10_0[59]' # RPi Cam Web Interface
591591
aSOFTWARE_NAME10_0[176]='Uptime Kuma'
592+
unset -v 'aSOFTWARE_NAME10_0[48]' # Pydio
592593

593594
# Pre-create software counter array so that we can see also software (available in newest version) with 0 installs
594595
for i in "${aSOFTWARE_NAME10_0[@]}"

.update/patches

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2191,6 +2191,9 @@ Patch_10_0()
21912191
# RPi Cam Web Interface
21922192
grep -q '^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[59\]=' /boot/dietpi/.installed && G_EXEC sed --follow-symlinks -i '/^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[59\]=/d' /boot/dietpi/.installed
21932193

2194+
# Pydio
2195+
grep -q '^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[48\]=' /boot/dietpi/.installed && G_EXEC sed --follow-symlinks -i '/^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[48\]=/d' /boot/dietpi/.installed
2196+
21942197
# Pi-hole v6 migration
21952198
# - /etc/pihole/pihole.toml indicates that Pi-hole has been upgraded to v6 already.
21962199
# - The /var/www/pihole symlink indicates that an instance installed via dietpi-software has not been migrated yet.

CHANGELOG.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ Removed SBC support:
1313
- 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 those. 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.
1414

1515
Removed software:
16-
- 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.
16+
- 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. To uninstall RPi Cam Web Interface remains on DietPi v10.x, follow these steps: https://github.com/MichaIng/DietPi/pull/7912
1717
- 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: https://github.com/MichaIng/DietPi/pull/7886
18+
- The removal of support for Debian 11 Bullseye implies the removal of the classic Pydio 8 software option. It does not support PHP 8.x, with Pydio Cells as its successor. We will add Pydio Cells with DietPi v10.1. A migration of data is possible, but has limitations and requires some preparation: https://docs.pydio.com/cells-v4/admin-guide/advanced/migrate-pydio-8-to-cells/. Please let us know if you require a possibility to migrate your Pydio 8 to Pydio Cells after reading the related docs. Depending on interest, we can backport Pydio Cells to a DietPi v9.20.x release on the dedicated compat branch, so that it can be installed alongside Pydio 8 to allow a direct migration. To uninstall Pydio 8 remains on DietPi v10.x, follow these steps: https://github.com/MichaIng/DietPi/pull/7912
1819

1920
Enhancement:
2021
- Raspberry Pi | DietPi can now be selected within the Raspberry Pi Imager below "Other general-purpose OS" for all Raspberry Pi models.

dietpi/dietpi-software

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -768,15 +768,6 @@ Available commands:
768768
aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/cloud/#nextcloud-talk'
769769
aSOFTWARE_DEPS[$software_id]='114'
770770
#------------------
771-
software_id=48
772-
aSOFTWARE_NAME[$software_id]='Pydio'
773-
aSOFTWARE_DESC[$software_id]='Feature-rich backup and sync server'
774-
aSOFTWARE_CATX[$software_id]=4
775-
aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/cloud/#pydio'
776-
aSOFTWARE_DEPS[$software_id]='88 89 webserver'
777-
# - Disabled: No PHP 8.x support: https://github.com/MichaIng/DietPi/issues/3469
778-
aSOFTWARE_AVAIL_G_DISTRO[$software_id,$G_DISTRO]=0
779-
#------------------
780771
software_id=111
781772
aSOFTWARE_NAME[$software_id]='UrBackup Server'
782773
aSOFTWARE_DESC[$software_id]='Full system backup server'
@@ -8008,86 +7999,6 @@ _EOF_
80087999
G_AGI "shairport-sync$airplay2"
80098000
fi
80108001

8011-
if To_Install 48 # Pydio
8012-
then
8013-
# Install required PHP modules
8014-
aDEPS=("php$PHP_VERSION-apcu" "php$PHP_VERSION-gd" "php$PHP_VERSION-intl" "php$PHP_VERSION-mbstring" "php$PHP_VERSION-opcache" "php$PHP_VERSION-xml")
8015-
8016-
# Reinstall: Skip download and install, advice to use internal updater from web UI
8017-
if [[ -d '/var/www/pydio' ]]
8018-
then
8019-
G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} install dir \"/var/www/pydio\" already exists. Download and install steps will be skipped.
8020-
- If you want to update ${aSOFTWARE_NAME[$software_id]}, please use the internal updater from web UI.
8021-
- If you need to reinstall (e.g. broken instance), please manually backup your config files+data, remove the install dir and rerun \"dietpi-software (re)install $software_id\"."
8022-
8023-
G_AGI "${aDEPS[@]}"
8024-
aDEPS=()
8025-
else
8026-
Download_Install 'https://download.pydio.com/pub/core/ci/pydio-latest.tar.gz'
8027-
G_EXEC mv pydio-latest /var/www/pydio
8028-
fi
8029-
8030-
# PHP configuration
8031-
G_EXEC phpenmod apcu gd intl pdo_mysql dom mbstring xml
8032-
8033-
# Webserver config
8034-
# - Apache
8035-
if (( ${aSOFTWARE_INSTALL_STATE[83]} > 0 ))
8036-
then
8037-
# Enable Apache rewrite engine
8038-
a2enmod rewrite
8039-
8040-
# Move Pydio Apache config in place
8041-
dps_index=$software_id Download_Install 'apache.pydio.conf' /etc/apache2/sites-available/dietpi-pydio.conf
8042-
a2ensite dietpi-pydio
8043-
8044-
# - Lighttpd
8045-
elif (( ${aSOFTWARE_INSTALL_STATE[84]} > 0 ))
8046-
then
8047-
# Enable Lighttpd setenv, access and rewrite modules
8048-
G_CONFIG_INJECT '"mod_access",' ' "mod_access",' /etc/lighttpd/lighttpd.conf '"mod_.+",'
8049-
[[ -f '/etc/lighttpd/conf-enabled/05-setenv.conf' ]] || G_EXEC lighty-enable-mod setenv
8050-
8051-
# Move Pydio Lighttpd config in place
8052-
dps_index=$software_id Download_Install 'lighttpd.pydio.conf' /etc/lighttpd/conf-available/99-dietpi-pydio.conf
8053-
G_EXEC_POST_FUNC(){ [[ $exit_code == 2 ]] && exit_code=0; } # Do not fail if modules are enabled already
8054-
G_EXEC lighty-enable-mod rewrite dietpi-pydio
8055-
8056-
# - Nginx
8057-
elif (( ${aSOFTWARE_INSTALL_STATE[85]} > 0 ))
8058-
then
8059-
# Move Pydio Nginx config in place
8060-
dps_index=$software_id Download_Install 'nginx.pydio.conf' /etc/nginx/sites-dietpi/dietpi-pydio.conf
8061-
fi
8062-
8063-
# Database
8064-
/boot/dietpi/func/create_mysql_db pydio pydio "$GLOBAL_PW"
8065-
8066-
# Setup data directory
8067-
local data_dir='/mnt/dietpi_userdata/pydio_data'
8068-
# - Skip if already existent
8069-
if [[ -d $data_dir ]]
8070-
then
8071-
G_DIETPI-NOTIFY 2 "Existing $data_dir found, will migrate..."
8072-
[[ -e '/var/www/pydio/data' ]] && G_EXEC rm -R /var/www/pydio/data
8073-
else
8074-
# Move data structure
8075-
[[ -e $data_dir || -L $data_dir ]] && G_EXEC rm -R "$data_dir"
8076-
if [[ -d '/var/www/pydio/data' ]]
8077-
then
8078-
G_EXEC mv /var/www/pydio/data "$data_dir"
8079-
else
8080-
G_EXEC mkdir "$data_dir"
8081-
fi
8082-
fi
8083-
# - Create symlink
8084-
G_EXEC ln -sf "$data_dir" /var/www/pydio/data
8085-
8086-
# Permissions: Fix some files being 444 mode, breaking internal updater
8087-
G_EXEC chown -R www-data:www-data /var/www/pydio "$data_dir"
8088-
G_EXEC chmod -R u+w /var/www/pydio
8089-
fi
8090-
80918002
if To_Install 36 squeezelite # Squeezelite
80928003
then
80938004
G_AGI squeezelite
@@ -13546,20 +13457,6 @@ _EOF_
1354613457
ip6tables -t nat -F
1354713458
fi
1354813459

13549-
if To_Uninstall 48 # Pydio
13550-
then
13551-
[[ -d '/var/www/pydio' ]] && G_EXEC rm -R /var/www/pydio
13552-
13553-
# Remove webserver configs
13554-
command -v a2dissite > /dev/null && a2dissite dietpi-pydio
13555-
[[ -f '/etc/apache2/conf-available/dietpi-pydio.conf' ]] && G_EXEC rm /etc/apache2/conf-available/dietpi-pydio.conf
13556-
[[ -f '/etc/nginx/sites-dietpi/dietpi-pydio.conf' ]] && G_EXEC rm /etc/nginx/sites-dietpi/dietpi-pydio.conf
13557-
command -v lighty-disable-mod > /dev/null && lighty-disable-mod dietpi-pydio
13558-
[[ -f '/etc/lighttpd/conf-available/99-dietpi-pydio.conf' ]] && G_EXEC rm /etc/lighttpd/conf-available/99-dietpi-pydio.conf
13559-
13560-
Remove_Database pydio
13561-
fi
13562-
1356313460
if To_Uninstall 36 # Squeezelite
1356413461
then
1356513462
G_AGP squeezelite

0 commit comments

Comments
 (0)