From 3ab4c18e8c0913371e6708e5814804a389e112e5 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Thu, 7 Jun 2018 20:44:00 +0200 Subject: [PATCH 1/7] Upgrade to upstream version 13.0.3 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 014b49c..84f7f7c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Nextcloud for YunoHost own data. A personal cloud which run on your own server. With Nextcloud you can synchronize your files over your devices. -**Shipped version:** 13.0.2 +**Shipped version:** 13.0.3 [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud) ![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png) diff --git a/manifest.json b/manifest.json index 2f8cd21..3abce85 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms", "fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions" }, - "version": "13.0.2~ynh1", + "version": "13.0.3~ynh1", "url": "https://nextcloud.com", "license": "AGPL-3.0", "maintainer": { diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 04ffd38..0db575e 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,11 +1,10 @@ #!/bin/bash # Last available nextcloud version -next_version="13.0.2" +next_version="13.0.3" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="7396f98a1a53a9f4b144f55360d87c89cb6ee899feef1cfbf29a736219f9c47d" +nextcloud_source_sha256="183667540800dd045ea57801fedf8ca280de82b91582412aad07d42ed71e93e4" # Patch nextcloud files only for the last version cp -a ../sources/patches_last_version/* ../sources/patches - From 51de0db3626e2889f2f93fe8838eb78551e67f48 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Thu, 14 Jun 2018 18:20:53 +0200 Subject: [PATCH 2/7] Fix Nextcloud apps upgrade (fixes #123) avoid putting existing apps in an inappropriate sub-directory after Nextcloud update... --- scripts/upgrade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e1901b8..6c54ca5 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -202,7 +202,8 @@ do # Backup 3rd party applications from the current nextcloud # But do not overwrite if there is any upgrade - cp -a --update "$final_path/apps" "$tmpdir/apps" + # (apps directory already exists in Nextcloud archive) + cp -a --update "$final_path/apps" "$tmpdir" # Replace the old nextcloud by the new one ynh_secure_remove "$final_path" From 634d607dd4dd4963842845eba2951407e7c2c5fa Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 24 Jun 2018 19:16:41 +0200 Subject: [PATCH 3/7] Don't use /tmp anymore --- scripts/upgrade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6c54ca5..ab91500 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -189,7 +189,7 @@ do ynh_replace_string "__SHA256_SUM__" "$nextcloud_source_sha256" "../conf/app.src" # Create a temporary directory - tmpdir=$(mktemp -d) + tmpdir="${final_path}_temp_upgrade_dir" # Install the next nextcloud version in $tmpdir ynh_setup_source "$tmpdir" @@ -208,6 +208,7 @@ do # Replace the old nextcloud by the new one ynh_secure_remove "$final_path" mv "$tmpdir" "$final_path" + ynh_secure_remove "$tmpdir" # Set write access for the following commands chown -R $app: "$final_path" "$datadir" From dc2c104242a252d4509237e52bbf37168b617b23 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 24 Jun 2018 19:19:04 +0200 Subject: [PATCH 4/7] Revert previous commit... --- scripts/upgrade | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index ab91500..6c54ca5 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -189,7 +189,7 @@ do ynh_replace_string "__SHA256_SUM__" "$nextcloud_source_sha256" "../conf/app.src" # Create a temporary directory - tmpdir="${final_path}_temp_upgrade_dir" + tmpdir=$(mktemp -d) # Install the next nextcloud version in $tmpdir ynh_setup_source "$tmpdir" @@ -208,7 +208,6 @@ do # Replace the old nextcloud by the new one ynh_secure_remove "$final_path" mv "$tmpdir" "$final_path" - ynh_secure_remove "$tmpdir" # Set write access for the following commands chown -R $app: "$final_path" "$datadir" From d9feba3dab44c35112deb3a7a64a6bc5b6b9c442 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sat, 30 Jun 2018 00:39:58 +0200 Subject: [PATCH 5/7] Fix upgrade from for stretch --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index df67e3a..6513463 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,7 @@ setup_private=0 setup_public=0 upgrade=1 - upgrade=1 from_commit=68c2f41da6b33bd8c949e5ba624bedba08c448be + upgrade=1 from_commit=1cdb9ea1619c6acaaa90bae88b5c4bed5084a2a7 backup_restore=1 multi_instance=0 incorrect_path=1 @@ -35,6 +35,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=68c2f41da6b33bd8c949e5ba624bedba08c448be - name=Move patches to the right folder + ; commit=1cdb9ea1619c6acaaa90bae88b5c4bed5084a2a7 + name= Fix Debian Stretch dependencies by installing php-apcu, php-mbstring … manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1& From c42091254e86fa15d056a206688425707b905e6a Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sun, 8 Jul 2018 19:58:38 +0200 Subject: [PATCH 6/7] Enable multi-instance capability (closes #42) --- README.md | 1 + check_process | 2 +- manifest.json | 2 +- scripts/install | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 84f7f7c..612863d 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ this package: * Integrate with YunoHost users and SSO - i.e. logout button * Allow one user to be the administrator (set at the installation) + * Allow multiple instances of this application * Optionally access the user home folder from Nextcloud files (set at the installation, the sharing is enabled by default) * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's diff --git a/check_process b/check_process index df67e3a..101cce1 100644 --- a/check_process +++ b/check_process @@ -14,7 +14,7 @@ upgrade=1 upgrade=1 from_commit=68c2f41da6b33bd8c949e5ba624bedba08c448be backup_restore=1 - multi_instance=0 + multi_instance=1 incorrect_path=1 port_already_use=0 change_url=0 diff --git a/manifest.json b/manifest.json index 3abce85..8c4a36f 100644 --- a/manifest.json +++ b/manifest.json @@ -16,7 +16,7 @@ "requirements": { "yunohost": ">= 2.7.2" }, - "multi_instance": false, + "multi_instance": true, "services": [ "nginx", "php5-fpm", diff --git a/scripts/install b/scripts/install index 0b2aac1..f46d396 100755 --- a/scripts/install +++ b/scripts/install @@ -274,7 +274,7 @@ chmod 755 /home/yunohost.app #================================================= # Use logrotate to manage application logfile -ynh_use_logrotate "/home/yunohost.app/nextcloud/data/nextcloud.log" +ynh_use_logrotate "${datadir}/nextcloud.log" #================================================= # SETUP SSOWAT From 0c52ede48585d6f24895e7e0bf66cb402f6f684a Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Mon, 23 Jul 2018 21:57:27 +0200 Subject: [PATCH 7/7] Upgrade to upstream version 13.0.5 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 84f7f7c..2b4eed5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Nextcloud for YunoHost own data. A personal cloud which run on your own server. With Nextcloud you can synchronize your files over your devices. -**Shipped version:** 13.0.3 +**Shipped version:** 13.0.5 [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud) ![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png) diff --git a/manifest.json b/manifest.json index 3abce85..f4f4627 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms", "fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions" }, - "version": "13.0.3~ynh1", + "version": "13.0.5~ynh1", "url": "https://nextcloud.com", "license": "AGPL-3.0", "maintainer": { diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 0db575e..cbd2d8e 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,10 +1,10 @@ #!/bin/bash # Last available nextcloud version -next_version="13.0.3" +next_version="13.0.5" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="183667540800dd045ea57801fedf8ca280de82b91582412aad07d42ed71e93e4" +nextcloud_source_sha256="a110d32849259ab79813af3078123a09057fc659ee414e5f3ed75451ec9e80ea" # Patch nextcloud files only for the last version cp -a ../sources/patches_last_version/* ../sources/patches