diff --git a/README.md b/README.md index 014b49c..e64886d 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.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) @@ -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..1741c5c 100644 --- a/check_process +++ b/check_process @@ -12,9 +12,9 @@ setup_private=0 setup_public=0 upgrade=1 - upgrade=1 from_commit=68c2f41da6b33bd8c949e5ba624bedba08c448be + upgrade=1 from_commit=1cdb9ea1619c6acaaa90bae88b5c4bed5084a2a7 backup_restore=1 - multi_instance=0 + multi_instance=1 incorrect_path=1 port_already_use=0 change_url=0 @@ -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& diff --git a/manifest.json b/manifest.json index 2f8cd21..97038f7 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.5~ynh1", "url": "https://nextcloud.com", "license": "AGPL-3.0", "maintainer": { @@ -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 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" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 04ffd38..cbd2d8e 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.5" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="7396f98a1a53a9f4b144f55360d87c89cb6ee899feef1cfbf29a736219f9c47d" +nextcloud_source_sha256="a110d32849259ab79813af3078123a09057fc659ee414e5f3ed75451ec9e80ea" # Patch nextcloud files only for the last version cp -a ../sources/patches_last_version/* ../sources/patches -