1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/nextcloud_ynh.git synced 2024-09-03 19:55:57 +02:00

Merge branch 'testing' into convert-mysql-charset

This commit is contained in:
Éric Gaspar 2023-01-28 17:50:31 +01:00
commit dcd018c0ea
7 changed files with 18 additions and 15 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Online storage, file sharing platform and various other applications Online storage, file sharing platform and various other applications
**Shipped version:** 25.0.2~ynh2 **Shipped version:** 25.0.3~ynh1
**Demo:** https://demo.nextcloud.com/ **Demo:** https://demo.nextcloud.com/

View file

@ -17,7 +17,7 @@ Si vous navez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
Stockage en ligne, plateforme de partage de fichiers et diverses autres applications Stockage en ligne, plateforme de partage de fichiers et diverses autres applications
**Version incluse :** 25.0.2~ynh2 **Version incluse :** 25.0.3~ynh1
**Démo :** https://demo.nextcloud.com/ **Démo :** https://demo.nextcloud.com/

View file

@ -13,8 +13,8 @@
setup_private=1 setup_private=1
setup_public=1 setup_public=1
upgrade=1 upgrade=1
#22.2.9 #25.0.2
upgrade=1 from_commit=f565b6d216f5340f752e6d6a21a14abc3811e0e7 upgrade=1 from_commit=c5cf91ad30149e1924c23b19e93f483c3ed3edd8
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
change_url=1 change_url=1
@ -22,6 +22,6 @@
Email= Email=
Notification=none Notification=none
;;; Upgrade options ;;; Upgrade options
; commit=f565b6d216f5340f752e6d6a21a14abc3811e0e7 ; commit=c5cf91ad30149e1924c23b19e93f483c3ed3edd8
name=Merge pull request #495 from YunoHost-Apps/22.2.9 name=Merge pull request #495 from YunoHost-Apps/25.0.2
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1& manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1&

View file

@ -28,7 +28,7 @@
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
"nginx", "nginx",
"php8.0-fpm", "php8.1-fpm",
"mysql" "mysql"
], ],
"arguments": { "arguments": {

View file

@ -4,8 +4,11 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
YNH_PHP_VERSION="8.0" YNH_PHP_VERSION="8.1"
pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath"
php_dependencies="php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath"
pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at $php_dependencies"
#================================================= #=================================================
# EXPERIMENTAL HELPERS # EXPERIMENTAL HELPERS

View file

@ -41,10 +41,10 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde
# Register (book) web path # Register (book) web path
ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
# Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures) # Check machine architecture (Nextcloud will soon deprecate 32-bit support)
if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ] if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
then then
ynh_print_warn --message="Nextcloud has deprecated 32-bit support. Version 25 should be the last one to support 32-bit architectures." ynh_print_warn --message="Nextcloud will soon deprecate 32-bit support. It is recommended to upgrade to a 64-bit architecture."
fi fi
#================================================= #=================================================

View file

@ -34,10 +34,10 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
upgrade_type=$(ynh_check_app_version_changed) upgrade_type=$(ynh_check_app_version_changed)
# Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures) # Check machine architecture (Nextcloud will soon deprecate 32-bit support)
if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ] if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
then then
ynh_print_warn --message="Nextcloud has deprecated 32-bit support. Version 25 is the last one to support 32-bit architectures." ynh_print_warn --message="Nextcloud will soon deprecate 32-bit support. It is recommended to upgrade to a 64-bit architecture."
fi fi
#================================================= #=================================================