From 94d52546eec8146479a0efe6560a4ace57d5eb3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 10:14:41 +0200 Subject: [PATCH 01/54] Update backup --- scripts/backup | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/backup b/scripts/backup index fc09803..924f0bd 100755 --- a/scripts/backup +++ b/scripts/backup @@ -39,13 +39,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# BACKUP THE MYSQL DATABASE -#================================================= -ynh_print_info --message="Backing up the MySQL database..." - -ynh_mysql_dump_db --database="$db_name" --default_character_set="utf8mb4" > db.sql - #================================================= # SPECIFIC BACKUP #================================================= @@ -72,7 +65,7 @@ ynh_backup --src_path="/etc/cron.d/$app" #================================================= ynh_print_info --message="Backing up the MySQL database..." -ynh_mysql_dump_db --database="$db_name" > db.sql +ynh_mysql_dump_db --database="$db_name" --default_character_set="utf8mb4" > db.sql #================================================= # END OF SCRIPT From c2d3b55aa10246f7d78457c25ced9deda7b1fede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 10:25:38 +0200 Subject: [PATCH 02/54] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index df854d0..9bc603e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,7 +118,7 @@ create_external_storage() { local data_dir="$1" local mount_name="$2" local mount_id=$(exec_occ files_external:create --output=json \ - "$mount_name" 'local' 'null::null' -c "data_dir=$data_dir" || true) + "$mount_name" 'local' 'null::null' -c "data_dir=$data_dir/data" || true) ! [[ $mount_id =~ ^[0-9]+$ ]] \ && ynh_print_warn --message="Unable to create external storage" \ || exec_occ files_external:option "$mount_id" enable_sharing true From c06a59c7ab3b06859eefbb87276abcb13a9ad191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 10:35:44 +0200 Subject: [PATCH 03/54] cleaning --- scripts/upgrade | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9bc603e..3554a9d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,8 +123,6 @@ local mount_id=$(exec_occ files_external:create --output=json \ && ynh_print_warn --message="Unable to create external storage" \ || exec_occ files_external:option "$mount_id" enable_sharing true } -# Define app's data directory -#data_dir="/home/yunohost.app/$app/data" if [ "$upgrade_type" == "UPGRADE_APP" ] then @@ -188,7 +186,7 @@ then # Load the value for this version source upgrade.d/upgrade.$current_major_version.sh - ynh_print_info --message="Upgrade to nextcloud $next_version" + ynh_print_info --message="Upgrade to Nextcloud $next_version" # Create an app.src for this version of Nextcloud cat > ../conf/app.src << EOF From 6cdfbf5fc5d24bffe3a85caa6502fa47e20b5980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 11:24:45 +0200 Subject: [PATCH 04/54] Update _common.sh --- scripts/_common.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 19e6a36..8e445c1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,6 +8,19 @@ # EXPERIMENTAL HELPERS #================================================= +# Define a function to add an external storage +# Create the external storage for the given folders and enable sharing +create_external_storage() { +local datadir="$1" +local mount_name="$2" +local mount_id=`exec_occ files_external:create --output=json \ + "$mount_name" 'local' 'null::null' -c "datadir=$datadir/data" || true` +! [[ $mount_id =~ ^[0-9]+$ ]] \ + && ynh_print_warn --message="Unable to create external storage" \ + || exec_occ files_external:option "$mount_id" enable_sharing true +} + + # Check if an URL is already handled # usage: is_url_handled --domain=DOMAIN --path=PATH_URI is_url_handled() { From 444e6ce4a43004b7b71bf6cc739fe79ec943e367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 11:26:32 +0200 Subject: [PATCH 05/54] Update _common.sh --- scripts/_common.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 8e445c1..19e6a36 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,19 +8,6 @@ # EXPERIMENTAL HELPERS #================================================= -# Define a function to add an external storage -# Create the external storage for the given folders and enable sharing -create_external_storage() { -local datadir="$1" -local mount_name="$2" -local mount_id=`exec_occ files_external:create --output=json \ - "$mount_name" 'local' 'null::null' -c "datadir=$datadir/data" || true` -! [[ $mount_id =~ ^[0-9]+$ ]] \ - && ynh_print_warn --message="Unable to create external storage" \ - || exec_occ files_external:option "$mount_id" enable_sharing true -} - - # Check if an URL is already handled # usage: is_url_handled --domain=DOMAIN --path=PATH_URI is_url_handled() { From 2079c31ff2273d6a30c013ca92cd05a29949ccfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 11:37:06 +0200 Subject: [PATCH 06/54] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index ccfde36..ce873af 100755 --- a/scripts/install +++ b/scripts/install @@ -158,10 +158,10 @@ exec_occ ldap:test-config '' \ # Define a function to add an external storage # Create the external storage for the given folders and enable sharing create_external_storage() { - local data_dir="$1" + local datadir="$1" local mount_name="$2" local mount_id=`exec_occ files_external:create --output=json \ - "$mount_name" 'local' 'null::null' -c "data_dir=$data_dir/data" || true` + "$mount_name" 'local' 'null::null' -c "datadir=$data_dir/data" || true` ! [[ $mount_id =~ ^[0-9]+$ ]] \ && ynh_print_warn --message="Unable to create external storage" \ || exec_occ files_external:option "$mount_id" enable_sharing true From 00583a61613e42e9efd78439bd1bfa634eb3291b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 11:40:01 +0200 Subject: [PATCH 07/54] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3554a9d..5c085d4 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -115,10 +115,10 @@ exec_occ() { # Define a function to add an external storage # Create the external storage for the given folders and enable sharing create_external_storage() { -local data_dir="$1" +local datadir="$1" local mount_name="$2" local mount_id=$(exec_occ files_external:create --output=json \ - "$mount_name" 'local' 'null::null' -c "data_dir=$data_dir/data" || true) + "$mount_name" 'local' 'null::null' -c "datadir=$data_dir/data" || true) ! [[ $mount_id =~ ^[0-9]+$ ]] \ && ynh_print_warn --message="Unable to create external storage" \ || exec_occ files_external:option "$mount_id" enable_sharing true From 8dfe74737b7f6c6a124c32047d4683c0a9579a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 12:19:16 +0200 Subject: [PATCH 08/54] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index dafd7e5..58d7a39 100644 --- a/manifest.toml +++ b/manifest.toml @@ -25,7 +25,7 @@ multi_instance = true ldap = true sso = true disk = "50M" -ram.build = "300M" +ram.build = "500M" ram.runtime = "512M" [install] From 8cecb3af05986aa824291f2f0ea0f9ec62bf3fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 12:36:15 +0200 Subject: [PATCH 09/54] Update upgrade --- scripts/upgrade | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5c085d4..64c3c7e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,9 +99,12 @@ current_major_version=${current_version%%.*} # Define a function to execute commands with `occ` exec_occ() { # Backward compatibility to upgrade from older versions - if [ $current_major_version = "last" ] || [ $current_major_version -ge 24 ] + if [ $current_major_version = "last" ] then NEXTCLOUD_PHP_VERSION=$phpversion + elif [ $current_major_version -ge 24 ] + then + NEXTCLOUD_PHP_VERSION="8.0" elif [ $current_major_version -ge 15 ] then NEXTCLOUD_PHP_VERSION="7.4" From fc177df863606e4f1a1c7271947c0089a45bd46c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 13:50:53 +0200 Subject: [PATCH 10/54] Update upgrade --- scripts/upgrade | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 64c3c7e..5c085d4 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,12 +99,9 @@ current_major_version=${current_version%%.*} # Define a function to execute commands with `occ` exec_occ() { # Backward compatibility to upgrade from older versions - if [ $current_major_version = "last" ] + if [ $current_major_version = "last" ] || [ $current_major_version -ge 24 ] then NEXTCLOUD_PHP_VERSION=$phpversion - elif [ $current_major_version -ge 24 ] - then - NEXTCLOUD_PHP_VERSION="8.0" elif [ $current_major_version -ge 15 ] then NEXTCLOUD_PHP_VERSION="7.4" From 195de623082ff1a5b92e5f1e7706e368c8d7afdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 14:28:15 +0200 Subject: [PATCH 11/54] #584 --- scripts/install | 8 ++++---- scripts/restore | 8 ++++---- scripts/upgrade | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index ce873af..85e1ca4 100755 --- a/scripts/install +++ b/scripts/install @@ -257,10 +257,10 @@ ynh_multimedia_addaccess $app # Fix app ownerships & permissions chown -R $app:www-data "$install_dir" chown -R $app: "$data_dir" -find $install_dir/ -type f -print0 | xargs -0 chmod 0644 -find $install_dir/ -type d -print0 | xargs -0 chmod 0755 -find $data_dir/data/ -type f -print0 | xargs -0 chmod 0640 -find $data_dir/data/ -type d -print0 | xargs -0 chmod 0750 +find $install_dir/ -type f -print0 | xargs -r0 chmod 0644 +find $install_dir/ -type d -print0 | xargs -r0 chmod 0755 +find $data_dir/data/ -type f -print0 | xargs -r0 chmod 0640 +find $data_dir/data/ -type d -print0 | xargs -r0 chmod 0750 chmod 640 "$install_dir/config/config.php" chmod 755 /home/yunohost.app chmod 750 $install_dir diff --git a/scripts/restore b/scripts/restore index 3dde00f..90d8fba 100755 --- a/scripts/restore +++ b/scripts/restore @@ -81,10 +81,10 @@ ynh_restore_file --origin_path="$data_dir" --not_mandatory # Fix app ownerships & permissions chown -R $app:www-data "$install_dir" chown -R $app: "$data_dir" -find $install_dir/ -type f -print0 | xargs -0 chmod 0644 -find $install_dir/ -type d -print0 | xargs -0 chmod 0755 -find $data_dir/data/ -type f -print0 | xargs -0 chmod 0640 -find $data_dir/data/ -type d -print0 | xargs -0 chmod 0750 +find $install_dir/ -type f -print0 | xargs -r0 chmod 0644 +find $install_dir/ -type d -print0 | xargs -r0 chmod 0755 +find $data_dir/data/ -type f -print0 | xargs -r0 chmod 0640 +find $data_dir/data/ -type d -print0 | xargs -r0 chmod 0750 chmod 640 "$install_dir/config/config.php" chmod 755 /home/yunohost.app chmod 750 $install_dir diff --git a/scripts/upgrade b/scripts/upgrade index 5c085d4..cd5db61 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -341,10 +341,10 @@ exec_occ background:cron # Fix app ownerships & permissions chown -R $app:www-data "$install_dir" chown -R $app: "$data_dir" -find $install_dir/ -type f -print0 | xargs -0 chmod 0644 -find $install_dir/ -type d -print0 | xargs -0 chmod 0755 -find $data_dir/data/ -type f -print0 | xargs -0 chmod 0640 -find $data_dir/data/ -type d -print0 | xargs -0 chmod 0750 +find $install_dir/ -type f -print0 | xargs -r0 chmod 0644 +find $install_dir/ -type d -print0 | xargs -r0 chmod 0755 +find $data_dir/data/ -type f -print0 | xargs -r0 chmod 0640 +find $data_dir/data/ -type d -print0 | xargs -r0 chmod 0750 chmod 640 "$install_dir/config/config.php" chmod 755 /home/yunohost.app chmod 750 $install_dir From dce54d8f45cbac07c5ca60fce10723fa1f444a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Jun 2023 14:47:38 +0200 Subject: [PATCH 12/54] Update change_url --- scripts/change_url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index 156db53..0d8a142 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -41,7 +41,7 @@ then # Check if .well-known is available for this domain if is_url_handled --domain="$new_domain" --path="/.well-known/caldav" || is_url_handled --domain="$new_domain" --path="/.well-known/carddav" then - ynh_print_warn --message="Another app already uses the domain $new_domain to serve a caldav/carddav feature. You may encounter issues when dealing with your calendar or address book." + ynh_print_warn --message="Another app already uses the domain $new_domain to serve a CalDAV/CardDAV feature. You may encounter issues when dealing with your calendar or address book." # Remove lines about .well-known/carddav and caldav with sed. sed --in-place --regexp-extended '/location = \/\.well\-known\/(caldav|carddav)/d' "/etc/nginx/conf.d/$new_domain.d/$app.conf" From 2d88325ab6bfe3ec5fda545175346891a6e73f37 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 12 Jun 2023 11:17:03 +0000 Subject: [PATCH 13/54] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c38ca36..43281fc 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,7 @@ this package: * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 26.0.2~ynh3 - +**Shipped version:** 26.0.2~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index b231091..173f9a5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,8 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 26.0.2~ynh3 - +**Version incluse :** 26.0.2~ynh1 **Démo :** https://demo.nextcloud.com/ From c80b08ab36cfe6652a432df6cf16e5a80ac1f529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 12 Jun 2023 17:55:28 +0200 Subject: [PATCH 14/54] update apps during upgrade --- scripts/upgrade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index cd5db61..30639a7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -271,6 +271,9 @@ EOF # Enable LDAP plugin exec_occ app:enable user_ldap + # Update all installed apps + exec_occ app:update --all + # Load the config file in nextcloud exec_occ config:import "$nc_conf" From b8c87fdcecb67334913f4b1114bcbd919431b6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 13 Jun 2023 09:29:46 +0200 Subject: [PATCH 15/54] how to CLI --- doc/ADMIN.md | 4 ++++ doc/ADMIN_fr.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 2feddbb..297d392 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,3 +1,7 @@ +### How to use CLI commande + +`sudo -u __APP__ php__YNH_PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...` + ### Configure ONLYOFFICE integration #### With Nextcloud App (no ARM support, lower performance) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 4977f09..17a332b 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,3 +1,7 @@ +### Comment utiliser la commande CLI + +`sudo -u __APP__ php__YNH_PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...` + ### Configurer l'intégration d'ONLYOFFICE #### Avec l'application Nextcloud (pas de support ARM, performances limitées) From b48cf22c278e8c28215e013cf0d0948ba3c40208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 13 Jun 2023 09:33:16 +0200 Subject: [PATCH 16/54] cleaning --- doc/ADMIN.md | 3 +-- doc/ADMIN_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 297d392..b72d2bb 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -6,12 +6,11 @@ #### With Nextcloud App (no ARM support, lower performance) -Starting from Nextcloud 18, it features a direct integration of ONLYOFFICE (an online rich text document editor) through a Nextcloud app. +Nextcloud features a direct integration of ONLYOFFICE (an online rich text document editor) through a Nextcloud app. To install and configure it: - Install *Community Document Server* application in your Nextcloud. That's the part that runs ONLYOFFICE server. - Install *ONLYOFFICE* application. That's the client part that will connect to an ONLYOFFICE server. - Then in Settings -> ONLYOFFICE (`https://__DOMAIN__/__PATH__/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by ONLYOFFICE. -- Here you go :) You should be able to create new type of documents and open them. *NB: ONLYOFFICE Nextcloud App is only available for x86 architecture - for **ARM** architecture (Raspberry Pi, OLinuXino...), consider the YunoHost App below* diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 17a332b..a34ae96 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -6,12 +6,11 @@ #### Avec l'application Nextcloud (pas de support ARM, performances limitées) -À partir de sa version 18, Nextcloud inclut une intégration directe de ONLYOFFICE (un éditeur de texte enrichi en ligne) via une application Nextcloud. +Nextcloud inclut une intégration directe de ONLYOFFICE (un éditeur de texte enrichi en ligne) via une application Nextcloud. Pour l'installer et la configurer : - Installez l'application *Community Document Server* dans votre Nextcloud. C'est la partie qui fait tourner un serveur ONLYOFFICE. - Installez l'application *ONLYOFFICE*. C'est la partie cliente qui va se connecter au serveur ONLYOFFICE. - Ensuite dans les Paramètres -> ONLYOFFICE (`https://__DOMAIN__/__PATH__/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec ONLYOFFICE. -- Et voilà :) Vous devriez pouvoir créer de nouveaux types de documents, et les ouvrir. *NB : l'app Nextcloud ONLYOFFICE Community Document Server n'est disponible que sous architecture x86 - Pour un support de l'architecture **ARM** (Raspberry Pi, OLinuXino...), installez plutôt l'App YunoHost, voir ci-dessous* From fb61cba65100cc96c87cc04383e603e09a340609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 13 Jun 2023 12:01:49 +0200 Subject: [PATCH 17/54] Update tests.toml --- tests.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests.toml b/tests.toml index 44dd598..85768fa 100644 --- a/tests.toml +++ b/tests.toml @@ -7,6 +7,5 @@ test_format = 1.0 # ------------------------------- test_upgrade_from.c5cf91ad.name = "Upgrade from 25.0.2" - - - + test_upgrade_from.caf917f3.name = "Upgrade from 26.0.2" + \ No newline at end of file From 38b2b7e965440f65cfba8c5be3e4afcea04737ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 13 Jun 2023 13:28:52 +0200 Subject: [PATCH 18/54] 27.0.0 --- manifest.toml | 2 +- scripts/upgrade.d/upgrade.26.sh | 7 +++++++ scripts/upgrade.d/upgrade.last.sh | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.26.sh diff --git a/manifest.toml b/manifest.toml index 58d7a39..52c0f94 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Nextcloud" description.en = "Online storage, file sharing platform and various other applications" description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" -version = "26.0.2~ynh1" +version = "27.0.0~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.26.sh b/scripts/upgrade.d/upgrade.26.sh new file mode 100644 index 0000000..59b4622 --- /dev/null +++ b/scripts/upgrade.d/upgrade.26.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Last available Nextcloud version +next_version="27.0.0" + +# Nextcloud tarball checksum sha256 +nextcloud_source_sha256="3d312a09b9345ac058758dd7b4059bf3cf0b1f0f1d747251b6fac3585ba6533f" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index ba24f4f..59b4622 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="26.0.2" +next_version="27.0.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="f3db0ec5e0aaff7c088eb34f752d77d79913bc6784e0fc47a84cdaa28e567a33" +nextcloud_source_sha256="3d312a09b9345ac058758dd7b4059bf3cf0b1f0f1d747251b6fac3585ba6533f" From d6446cbe33abbce49394eb9ee34190596f4f25bd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 13 Jun 2023 11:28:58 +0000 Subject: [PATCH 19/54] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 43281fc..719d640 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ this package: * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 26.0.2~ynh1 +**Shipped version:** 27.0.0~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 173f9a5..c443752 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 26.0.2~ynh1 +**Version incluse :** 27.0.0~ynh1 **Démo :** https://demo.nextcloud.com/ From b671f959813c2538c054994a4ee39ba54c6843d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 13 Jun 2023 16:02:00 +0200 Subject: [PATCH 20/54] cleaning --- doc/ADMIN.md | 2 +- doc/ADMIN_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index b72d2bb..cbd7a82 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -10,7 +10,7 @@ Nextcloud features a direct integration of ONLYOFFICE (an online rich text docum To install and configure it: - Install *Community Document Server* application in your Nextcloud. That's the part that runs ONLYOFFICE server. - Install *ONLYOFFICE* application. That's the client part that will connect to an ONLYOFFICE server. -- Then in Settings -> ONLYOFFICE (`https://__DOMAIN__/__PATH__/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by ONLYOFFICE. +- Then in Settings -> ONLYOFFICE (`https://__DOMAIN____PATH__/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by ONLYOFFICE. *NB: ONLYOFFICE Nextcloud App is only available for x86 architecture - for **ARM** architecture (Raspberry Pi, OLinuXino...), consider the YunoHost App below* diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index a34ae96..a449e52 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -10,7 +10,7 @@ Nextcloud inclut une intégration directe de ONLYOFFICE (un éditeur de texte en Pour l'installer et la configurer : - Installez l'application *Community Document Server* dans votre Nextcloud. C'est la partie qui fait tourner un serveur ONLYOFFICE. - Installez l'application *ONLYOFFICE*. C'est la partie cliente qui va se connecter au serveur ONLYOFFICE. -- Ensuite dans les Paramètres -> ONLYOFFICE (`https://__DOMAIN__/__PATH__/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec ONLYOFFICE. +- Ensuite dans les Paramètres -> ONLYOFFICE (`https://__DOMAIN____PATH__/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec ONLYOFFICE. *NB : l'app Nextcloud ONLYOFFICE Community Document Server n'est disponible que sous architecture x86 - Pour un support de l'architecture **ARM** (Raspberry Pi, OLinuXino...), installez plutôt l'App YunoHost, voir ci-dessous* From b081780ae1ed677ca1e5f303db5286201cb5b513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Jul 2023 17:15:59 +0200 Subject: [PATCH 21/54] fix --- manifest.toml | 4 ++-- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 52c0f94..bcc2082 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Nextcloud" description.en = "Online storage, file sharing platform and various other applications" description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" -version = "27.0.0~ynh1" +version = "27.0.1~ynh1" maintainers = ["kay0u"] @@ -19,7 +19,7 @@ code = "https://github.com/nextcloud/server" cpe = "cpe:2.3:a:nextcloud:nextcloud" [integration] -yunohost = ">= 11.1.20" +yunohost = ">= 11.1.21" architectures = ["amd64", "arm64"] multi_instance = true ldap = true diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 59b4622..32b7722 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="27.0.0" +next_version="27.0.1" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="3d312a09b9345ac058758dd7b4059bf3cf0b1f0f1d747251b6fac3585ba6533f" +nextcloud_source_sha256="3976b5e8f58f934ddbeb7cc49ac33b11ad3adbd7f6d5d0908a0fc36a160c27bd" From 93df16f2b76c893576023a0bfc0c0bd55e1f8dd0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 20 Jul 2023 15:16:05 +0000 Subject: [PATCH 22/54] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 719d640..de84a49 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ this package: * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 27.0.0~ynh1 +**Shipped version:** 27.0.1~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index c443752..539a463 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 27.0.0~ynh1 +**Version incluse :** 27.0.1~ynh1 **Démo :** https://demo.nextcloud.com/ From f30ce6fb4584be94af12620b0879324e2ed6e9a1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jul 2023 08:30:28 +0100 Subject: [PATCH 23/54] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index bcc2082..84f5b06 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ code = "https://github.com/nextcloud/server" cpe = "cpe:2.3:a:nextcloud:nextcloud" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = ["amd64", "arm64"] multi_instance = true ldap = true From 39ecdc53da11ba85b5dbcab2845f180f5f14779d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 11 Aug 2023 11:41:03 +0200 Subject: [PATCH 24/54] 27.0.2 --- manifest.toml | 2 +- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 84f5b06..47bb3b9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Nextcloud" description.en = "Online storage, file sharing platform and various other applications" description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" -version = "27.0.1~ynh1" +version = "27.0.2~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 32b7722..99a4829 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="27.0.1" +next_version="27.0.2" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="3976b5e8f58f934ddbeb7cc49ac33b11ad3adbd7f6d5d0908a0fc36a160c27bd" +nextcloud_source_sha256="7a2dcea43aa3b8fb303347efda4c6f37733cca113c8ee16dd9f0e5fb68c7212f" From bccca31d4e36802cf912f48bb0958e755f812f92 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 11 Aug 2023 09:41:08 +0000 Subject: [PATCH 25/54] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index de84a49..465375d 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ this package: * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 27.0.1~ynh1 +**Shipped version:** 27.0.2~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 539a463..f3c768b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 27.0.1~ynh1 +**Version incluse :** 27.0.2~ynh1 **Démo :** https://demo.nextcloud.com/ From 90a700e13788232891ff472130a127fbc4de6f18 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Aug 2023 23:04:23 +0200 Subject: [PATCH 26/54] #591 --- conf/nginx.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 395a5c5..1e49f62 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -105,6 +105,14 @@ location ^~ __PATH__/ { fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; fastcgi_intercept_errors on; fastcgi_request_buffering off; + + fastcgi_read_timeout 600; + fastcgi_send_timeout 600; + fastcgi_connect_timeout 600; + proxy_connect_timeout 600; + proxy_send_timeout 600; + proxy_read_timeout 600; + send_timeout 600; } location ~ ^__PATH__/(?:updater|oc[ms]-provider)(?:$|/) { From 5a174307c607fe1a0a60443ac03b3123c80e08c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 15 Sep 2023 16:47:49 +0200 Subject: [PATCH 27/54] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 47bb3b9..b013e70 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,7 +20,7 @@ cpe = "cpe:2.3:a:nextcloud:nextcloud" [integration] yunohost = ">= 11.2" -architectures = ["amd64", "arm64"] +architectures = ["amd64", "arm64", "armhf"] multi_instance = true ldap = true sso = true From d9cbf046fd401758f9ead30dd35e6219d7b6669a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:29:51 +0200 Subject: [PATCH 28/54] 27.1.0 --- manifest.toml | 2 +- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index b013e70..4a57d81 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Nextcloud" description.en = "Online storage, file sharing platform and various other applications" description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" -version = "27.0.2~ynh1" +version = "27.1.0~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 99a4829..1040e22 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="27.0.2" +next_version="27.1.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="7a2dcea43aa3b8fb303347efda4c6f37733cca113c8ee16dd9f0e5fb68c7212f" +nextcloud_source_sha256="c3167059e69c517b7ae07f3bb0b832433d324675859081fe953ea41bc7df1242" From 5a72380d4534a4ef3b1458f41d205364993364e8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 15 Sep 2023 19:29:58 +0000 Subject: [PATCH 29/54] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 465375d..25d9998 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ this package: * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 27.0.2~ynh1 +**Shipped version:** 27.1.0~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index f3c768b..4929825 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 27.0.2~ynh1 +**Version incluse :** 27.1.0~ynh1 **Démo :** https://demo.nextcloud.com/ From cc605dc4eb39f972a112c517948ff236eef45e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:22:01 +0200 Subject: [PATCH 30/54] 27.1.1 --- manifest.toml | 2 +- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 4a57d81..f90617b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Nextcloud" description.en = "Online storage, file sharing platform and various other applications" description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" -version = "27.1.0~ynh1" +version = "27.1.1~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 1040e22..9e6becf 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="27.1.0" +next_version="27.1.1" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="c3167059e69c517b7ae07f3bb0b832433d324675859081fe953ea41bc7df1242" +nextcloud_source_sha256="3a91500566874675676fa3b5bfae2587a839cde41dfac5318043b162c1311fab" From 4fd1ef1b3b5a1a2b6b541b035412aa2ecdb30f75 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 21 Sep 2023 11:22:05 +0000 Subject: [PATCH 31/54] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 25d9998..655d87d 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ this package: * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 27.1.0~ynh1 +**Shipped version:** 27.1.1~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 4929825..1ffd833 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 27.1.0~ynh1 +**Version incluse :** 27.1.1~ynh1 **Démo :** https://demo.nextcloud.com/ From 698a40827adba0b33ea66f572caad4d975ca1aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 08:21:16 +0200 Subject: [PATCH 32/54] 27.1.2 --- manifest.toml | 2 +- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index f90617b..c615510 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Nextcloud" description.en = "Online storage, file sharing platform and various other applications" description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" -version = "27.1.1~ynh1" +version = "27.1.2~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 9e6becf..09a19f6 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="27.1.1" +next_version="27.1.2" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="3a91500566874675676fa3b5bfae2587a839cde41dfac5318043b162c1311fab" +nextcloud_source_sha256="0742b247aaee0b7044db0062f0a914aa77338c7a7d8fe7da0917147d76689721" From 7bfeb14ad1023eff1cb7565faaa0fe13ed967e94 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 6 Oct 2023 06:21:21 +0000 Subject: [PATCH 33/54] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 655d87d..36f664c 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ this package: * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 27.1.1~ynh1 +**Shipped version:** 27.1.2~ynh1 **Demo:** https://demo.nextcloud.com/ @@ -44,7 +44,6 @@ this package: * Official user documentation: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 1ffd833..c198a08 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 27.1.1~ynh1 +**Version incluse :** 27.1.2~ynh1 **Démo :** https://demo.nextcloud.com/ @@ -43,7 +43,6 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From b46b53195ef4d2aff11a97931af5b36f234d6039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 09:45:47 +0200 Subject: [PATCH 34/54] Update nginx.conf --- conf/nginx.conf | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index f87ee5d..5852047 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -21,18 +21,9 @@ location ^~ __PATH__/ { # Path to source alias __INSTALL_DIR__/; - # Add headers to serve security related headers - more_set_headers "Strict-Transport-Security: max-age=15768000; includeSubDomains; preload;"; - more_set_headers "Referrer-Policy: no-referrer"; - more_set_headers "X-Content-Type-Options: nosniff"; - more_set_headers "X-Download-Options: noopen"; - more_set_headers "X-Frame-Options: SAMEORIGIN"; - more_set_headers "X-Permitted-Cross-Domain-Policies: none"; - more_set_headers "X-Robots-Tag: noindex, nofollow"; - more_set_headers "X-XSS-Protection: 1; mode=block"; - # Set max upload size client_max_body_size 10G; + client_body_timeout 300s; fastcgi_buffers 64 4K; # Enable gzip but do not remove ETag headers @@ -52,6 +43,16 @@ location ^~ __PATH__/ { # for tunning hints client_body_buffer_size 512k; + # Add headers to serve security related headers + more_set_headers "Strict-Transport-Security: max-age=15768000; includeSubDomains; preload;"; + more_set_headers "Referrer-Policy: no-referrer"; + more_set_headers "X-Content-Type-Options: nosniff"; + more_set_headers "X-Download-Options: noopen"; + more_set_headers "X-Frame-Options: SAMEORIGIN"; + more_set_headers "X-Permitted-Cross-Domain-Policies: none"; + more_set_headers "X-Robots-Tag: noindex, nofollow"; + more_set_headers "X-XSS-Protection: 1; mode=block"; + # Remove X-Powered-By, which is an information leak fastcgi_hide_header X-Powered-By; @@ -92,7 +93,7 @@ location ^~ __PATH__/ { # Required for legacy support # https://github.com/nextcloud/documentation/pull/2197#issuecomment-721432337 # This line fix the ldap admin page - rewrite ^__PATH__/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) __PATH__/index.php$request_uri; + rewrite ^__PATH__/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) __PATH__/index.php$request_uri; fastcgi_split_path_info ^(.+?\.php)(/.*)$; set $path_info $fastcgi_path_info; @@ -120,7 +121,7 @@ location ^~ __PATH__/ { send_timeout 600; } - location ~ ^__PATH__/(?:updater|oc[ms]-provider)(?:$|/) { + location ~ ^__PATH__/(?:updater|ocs-provider)(?:$|/) { try_files $uri/ =404; index index.php; } From 4476498872a89b9006ba53e3ab84f5f32329a593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 09:46:12 +0200 Subject: [PATCH 35/54] Update nginx.conf --- conf/nginx.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 5852047..d14ba9f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,7 +12,9 @@ location ^~ /.well-known { location = /.well-known/webfinger { return 301 __PATH__/index.php$uri; } location = /.well-known/nodeinfo { return 301 __PATH__/index.php$uri; } - try_files $uri $uri/ =404; + # Let Nextcloud's API for `/.well-known` URIs handle all other + # requests by passing them to the front-end controller. + return 301 __PATH__/index.php$request_uri; } #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; From ee03b250708c92c0e0e3756278be341942270ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:22:29 +0200 Subject: [PATCH 36/54] add mail setup --- conf/config.json | 8 +++++++- manifest.toml | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/conf/config.json b/conf/config.json index 9e1c8f0..e71af9d 100644 --- a/conf/config.json +++ b/conf/config.json @@ -13,7 +13,13 @@ }, "hashing_default_password": true, "localstorage.allowsymlinks": true, - "simpleSignUpLink.shown": false + "simpleSignUpLink.shown": false, + "mail_smtpmode": "smtp", + "mail_smtphost": "smtp://__APP__:__MAIL_PWD__@__DOMAIN__:587/?tls=True", + "mail_smtpport": 587, + "mail_smtpauth": true, + "mail_smtpname": "__APP__", + "mail_smtppassword": "__MAIL_PWD__" }, "apps": { "user_ldap": { diff --git a/manifest.toml b/manifest.toml index c615510..ee17184 100644 --- a/manifest.toml +++ b/manifest.toml @@ -53,6 +53,7 @@ ram.runtime = "512M" [resources] [resources.system_user] + allow_email = true [resources.install_dir] From f2e491a7a4946b03d2dc315d3ddb783b2397d33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:31:43 +0200 Subject: [PATCH 37/54] Update config.json --- conf/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.json b/conf/config.json index e71af9d..2c0f344 100644 --- a/conf/config.json +++ b/conf/config.json @@ -15,7 +15,7 @@ "localstorage.allowsymlinks": true, "simpleSignUpLink.shown": false, "mail_smtpmode": "smtp", - "mail_smtphost": "smtp://__APP__:__MAIL_PWD__@__DOMAIN__:587/?tls=True", + "mail_smtphost": "smtp://__APP__:__MAIL_PWD__@localhost:587/?tls=True", "mail_smtpport": 587, "mail_smtpauth": true, "mail_smtpname": "__APP__", From 711050a22e340652160b1c9120224b4992e52710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:52:14 +0200 Subject: [PATCH 38/54] Update config.json --- conf/config.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/conf/config.json b/conf/config.json index 2c0f344..18909f8 100644 --- a/conf/config.json +++ b/conf/config.json @@ -15,11 +15,9 @@ "localstorage.allowsymlinks": true, "simpleSignUpLink.shown": false, "mail_smtpmode": "smtp", - "mail_smtphost": "smtp://__APP__:__MAIL_PWD__@localhost:587/?tls=True", - "mail_smtpport": 587, - "mail_smtpauth": true, - "mail_smtpname": "__APP__", - "mail_smtppassword": "__MAIL_PWD__" + "mail_smtphost": "localhost", + "mail_smtpport": 25, + "mail_smtpauth": false }, "apps": { "user_ldap": { From cae89b069c9266966767910f5e2f805ef03e74ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:58:06 +0200 Subject: [PATCH 39/54] Revert "Update config.json" This reverts commit 711050a22e340652160b1c9120224b4992e52710. --- conf/config.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/conf/config.json b/conf/config.json index 18909f8..2c0f344 100644 --- a/conf/config.json +++ b/conf/config.json @@ -15,9 +15,11 @@ "localstorage.allowsymlinks": true, "simpleSignUpLink.shown": false, "mail_smtpmode": "smtp", - "mail_smtphost": "localhost", - "mail_smtpport": 25, - "mail_smtpauth": false + "mail_smtphost": "smtp://__APP__:__MAIL_PWD__@localhost:587/?tls=True", + "mail_smtpport": 587, + "mail_smtpauth": true, + "mail_smtpname": "__APP__", + "mail_smtppassword": "__MAIL_PWD__" }, "apps": { "user_ldap": { From 263b17638ca9ddd7b21f0e0ddc9fb3c180d1486d Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:50:57 +0200 Subject: [PATCH 40/54] Provide proper mail configuration --- conf/config.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/conf/config.json b/conf/config.json index 2c0f344..1cd7f95 100644 --- a/conf/config.json +++ b/conf/config.json @@ -15,11 +15,21 @@ "localstorage.allowsymlinks": true, "simpleSignUpLink.shown": false, "mail_smtpmode": "smtp", - "mail_smtphost": "smtp://__APP__:__MAIL_PWD__@localhost:587/?tls=True", - "mail_smtpport": 587, - "mail_smtpauth": true, + "mail_smtpport": "25", + "mail_smtpauth": 1, "mail_smtpname": "__APP__", - "mail_smtppassword": "__MAIL_PWD__" + "mail_smtppassword": "__MAIL_PWD__", + "mail_sendmailmode": "smtp", + "mail_from_address": "__APP__", + "mail_domain": "__DOMAIN__", + "mail_smtphost": "localhost", + "mail_smtpstreamoptions": { + "ssl": { + "allow_self_signed": true, + "verify_peer": false, + "verify_peer_name": false + } + } }, "apps": { "user_ldap": { From b4180e0479579fd142a245b8748034351d74cd04 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 Oct 2023 06:30:19 +0000 Subject: [PATCH 41/54] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aabc104..36f664c 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ this package: * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 27.1.2~ynh2 +**Shipped version:** 27.1.2~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 3c89b6d..c198a08 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 27.1.2~ynh2 +**Version incluse :** 27.1.2~ynh1 **Démo :** https://demo.nextcloud.com/ From 45fe24293be3ab013b046d57fcc3826749600af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 12 Oct 2023 18:03:59 +0200 Subject: [PATCH 42/54] Update extra_php-fpm.conf --- conf/extra_php-fpm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index 4e9d349..feee90b 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -8,7 +8,7 @@ php_value[default_charset] = UTF-8 ; OPcache is already activated by default ; php_value[opcache.enable]=1 ; The following parameters are nevertheless recommended for Nextcloud -; see here: https://docs.nextcloud.com/server/15/admin_manual/installation/server_tuning.html#enable-php-opcache +; see here: https://docs.nextcloud.com/server/20/admin_manual/installation/server_tuning.html#enable-php-opcache php_value[opcache.enable_cli]=1 php_value[opcache.interned_strings_buffer]=32 php_value[opcache.max_accelerated_files]=10000 From 8558d812d59c050b6e20650720525d56be72e70a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 21 Oct 2023 19:32:46 +0000 Subject: [PATCH 43/54] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 87a8919..36f664c 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,7 @@ this package: * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 27.1.2~ynh3 - +**Shipped version:** 27.1.2~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 6ca6637..c198a08 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,8 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 27.1.2~ynh3 - +**Version incluse :** 27.1.2~ynh1 **Démo :** https://demo.nextcloud.com/ From 2699202daf19eb9799305e8facfdcc53068c63c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 17:32:53 +0200 Subject: [PATCH 44/54] Update nginx.conf --- conf/nginx.conf | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9f73bfd..fda7626 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,10 @@ -location ^~ /.well-known { + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ^~ /.well-known { # The following 6 rules are borrowed from `.htaccess` # The following 2 rules are only needed for the user_webfinger app. @@ -23,7 +29,7 @@ location ^~ __PATH__/ { # Path to source alias __INSTALL_DIR__/; - # Set max upload size + # set max upload size and increase upload timeout: client_max_body_size 10G; client_body_timeout 300s; fastcgi_buffers 64 4K; @@ -45,7 +51,7 @@ location ^~ __PATH__/ { # for tunning hints client_body_buffer_size 512k; - # Add headers to serve security related headers + # HTTP response headers borrowed from Nextcloud `.htaccess` more_set_headers "Strict-Transport-Security: max-age=15768000; includeSubDomains; preload;"; more_set_headers "Referrer-Policy: no-referrer"; more_set_headers "X-Content-Type-Options: nosniff"; @@ -77,12 +83,6 @@ location ^~ __PATH__/ { } } - location = __PATH__/robots.txt { - allow all; - log_not_found off; - access_log off; - } - # Rules borrowed from `.htaccess` to hide certain paths from clients location ~ ^__PATH__/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; } location ~ ^__PATH__/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; } @@ -93,8 +93,6 @@ location ^~ __PATH__/ { # `/nextcloud/index.php` to the URI, resulting in a HTTP 500 error response. location ~ \.php(?:$|/) { # Required for legacy support - # https://github.com/nextcloud/documentation/pull/2197#issuecomment-721432337 - # This line fix the ldap admin page rewrite ^__PATH__/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) __PATH__/index.php$request_uri; fastcgi_split_path_info ^(.+?\.php)(/.*)$; @@ -111,6 +109,7 @@ location ^~ __PATH__/ { fastcgi_param front_controller_active true; # Enable pretty urls fastcgi_param HTTP_ACCEPT_ENCODING ""; # Disable encoding of nextcloud response to inject ynh scripts fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + fastcgi_intercept_errors on; fastcgi_request_buffering off; @@ -130,7 +129,7 @@ location ^~ __PATH__/ { location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map)$ { try_files $uri / __PATH__/index.php$request_uri; - expires 6M; # Cache-Control policy borrowed from `.htaccess` + more_set_headers "Cache-Control: public, max-age=15778463, $asset_immutable"; access_log off; # Optional: Don't log access to assets location ~ \.wasm$ { @@ -144,6 +143,11 @@ location ^~ __PATH__/ { access_log off; # Optional: Don't log access to assets } + # Rule borrowed from `.htaccess` + location __PATH__/remote { + return 301 __PATH__/remote.php$request_uri; + } + location ~ / { if ($request_method ~ ^(PUT|DELETE|PATCH)$) { rewrite ^ __PATH__/index.php$request_uri last; From 46c59266976328bf2b176661a97eb6e3acd5ca0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 17:56:58 +0200 Subject: [PATCH 45/54] Update nginx.conf --- conf/nginx.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index fda7626..6e0eb5d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,9 +1,3 @@ - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - location ^~ /.well-known { # The following 6 rules are borrowed from `.htaccess` From 5898a165bc88949dc3820b0d4e31d4f12828e829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 17:58:57 +0200 Subject: [PATCH 46/54] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6e0eb5d..9598907 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ - location ^~ /.well-known { +location ^~ /.well-known { # The following 6 rules are borrowed from `.htaccess` # The following 2 rules are only needed for the user_webfinger app. From dd843e771ea856c6cb82923789dd51b4fdf77dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 18:01:02 +0200 Subject: [PATCH 47/54] Update nginx.conf --- conf/nginx.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9598907..9fdb221 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -77,6 +77,12 @@ location ^~ __PATH__/ { } } + location = __PATH__/robots.txt { + allow all; + log_not_found off; + access_log off; + } + # Rules borrowed from `.htaccess` to hide certain paths from clients location ~ ^__PATH__/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; } location ~ ^__PATH__/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; } From 24871407542ee3a5263325d7207cbb70042311b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 18:03:34 +0200 Subject: [PATCH 48/54] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9fdb221..8ce72b8 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -129,7 +129,7 @@ location ^~ __PATH__/ { location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map)$ { try_files $uri / __PATH__/index.php$request_uri; - more_set_headers "Cache-Control: public, max-age=15778463, $asset_immutable"; + expires 6M; # Cache-Control policy borrowed from `.htaccess` access_log off; # Optional: Don't log access to assets location ~ \.wasm$ { From bc59f53dbb91aa089bbade0bac6afa55dec4e6f3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 26 Oct 2023 16:32:33 +0000 Subject: [PATCH 49/54] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 8f6bc2a..f983630 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ For better performance and ARM64 support, install ONLYOFFICE YunoHost App and co * Official user documentation: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index b763cd7..6444d1a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -62,6 +62,7 @@ Pour de meilleures performances et le support de ARM64, installez l'app YunoHos * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 9d934893f23424fc5c118fe9f4bcf2fa87715afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:21:01 +0200 Subject: [PATCH 50/54] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ee17184..fccf19c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Nextcloud" description.en = "Online storage, file sharing platform and various other applications" description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" -version = "27.1.2~ynh1" +version = "27.1.3~ynh1" maintainers = ["kay0u"] From cd7cc707a2762095a0f422c7d8d005464b50b4cc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 27 Oct 2023 09:21:10 +0000 Subject: [PATCH 51/54] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 36f664c..5ee58c0 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ this package: * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 27.1.2~ynh1 +**Shipped version:** 27.1.3~ynh1 **Demo:** https://demo.nextcloud.com/ @@ -44,6 +44,7 @@ this package: * Official user documentation: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index c198a08..c400f05 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 27.1.2~ynh1 +**Version incluse :** 27.1.3~ynh1 **Démo :** https://demo.nextcloud.com/ @@ -43,6 +43,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From d934c27e447ddcafe95b8d2f2cfcb1f78331fc49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Oct 2023 15:41:38 +0200 Subject: [PATCH 52/54] Update upgrade.last.sh --- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 09a19f6..4a851d5 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="27.1.2" +next_version="27.1.3" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="0742b247aaee0b7044db0062f0a914aa77338c7a7d8fe7da0917147d76689721" +nextcloud_source_sha256="1d614935245e4a375b4ac991c02f323592b753972f86f88763fd80ed7d275793" From a37ef189fb3b8f701e47272e71ef43e0da4b8625 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 29 Oct 2023 16:09:01 +0000 Subject: [PATCH 53/54] Implement phpflags and advertise command --- doc/ADMIN.md | 2 ++ doc/ADMIN_fr.md | 2 ++ scripts/install | 2 ++ scripts/upgrade | 6 +++++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index cbd7a82..ef43357 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -2,6 +2,8 @@ `sudo -u __APP__ php__YNH_PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...` +or use `sudo yunohost app shell __APP__` then run `php occ ...` + ### Configure ONLYOFFICE integration #### With Nextcloud App (no ARM support, lower performance) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index a449e52..c617ce3 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -2,6 +2,8 @@ `sudo -u __APP__ php__YNH_PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...` +ou utilisez `sudo yunohost app shell __APP__` puis `php occ ...` + ### Configurer l'intégration d'ONLYOFFICE #### Avec l'application Nextcloud (pas de support ARM, performances limitées) diff --git a/scripts/install b/scripts/install index 85e1ca4..a6f0336 100755 --- a/scripts/install +++ b/scripts/install @@ -18,6 +18,7 @@ maintenance_mode=0 fpm_footprint="high" fpm_free_footprint=0 fpm_usage="medium" +phpflags="--define apc.enable_cli=1" #================================================= # STORE SETTINGS FROM MANIFEST @@ -27,6 +28,7 @@ ynh_app_setting_set --app=$app --key=maintenance_mode --value=$maintenance_mode ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage +ynh_app_setting_set --app=$app --key=phpflags --value=$phpflags #================================================= # CREATE A MYSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 30639a7..accab23 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,12 +41,16 @@ if [ -z "${fpm_free_footprint:-}" ]; then ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint fi -# If fpm_usage doesn't exist, create it if [ -z "${fpm_usage:-}" ]; then fpm_usage=medium ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi +if [ -z "${phpflags:-}" ]; then + phpflags="--define apc.enable_cli=1" + ynh_app_setting_set --app=$app --key=phpflags --value=$phpflags +fi + # Delete existing ini configuration file (backward compatibility) if [ -f /etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini ]; then ynh_secure_remove --file=/etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini From 2763028257eb6e45f9d963712b4f453a37f07ea5 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 29 Oct 2023 16:11:30 +0000 Subject: [PATCH 54/54] Fix comments in upgrade --- scripts/upgrade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index accab23..bfaec82 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,11 +41,13 @@ if [ -z "${fpm_free_footprint:-}" ]; then ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint fi +# If fpm_usage doesn't exist, create it if [ -z "${fpm_usage:-}" ]; then fpm_usage=medium ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi +# If phpflags doesn't exist, create it if [ -z "${phpflags:-}" ]; then phpflags="--define apc.enable_cli=1" ynh_app_setting_set --app=$app --key=phpflags --value=$phpflags