diff --git a/README.md b/README.md index ba411b3..c95115f 100644 --- a/README.md +++ b/README.md @@ -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 -**Shipped version:** 22.1.1~ynh1 +**Shipped version:** 22.2.0~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index 63bea64..54224bd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Stockage en ligne, plateforme de partage de fichiers et diverses autres applications -**Version incluse :** 22.1.1~ynh1 +**Version incluse :** 22.2.0~ynh1 **Démo :** https://demo.nextcloud.com/ diff --git a/check_process b/check_process index 7ac5c52..ea81cc6 100644 --- a/check_process +++ b/check_process @@ -13,8 +13,6 @@ setup_private=1 setup_public=1 upgrade=1 - #19.0.3 - upgrade=1 from_commit=a03e25fac417e2e03e53ed3a7b7ed05185637360 #21.0.2 upgrade=1 from_commit=fa1f0da48d3edbdf5bcb3b8b70a0687b4e878d11 backup_restore=1 @@ -26,8 +24,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=a03e25fac417e2e03e53ed3a7b7ed05185637360 - name=Merge pull request #333 from ericgaspar/Upgrade-to-version-19.0.3 ; commit=fa1f0da48d3edbdf5bcb3b8b70a0687b4e878d11 name=Merge pull request #408 from YunoHost-Apps/21.0.2 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1& diff --git a/manifest.json b/manifest.json index c96f962..828abd9 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online storage, file sharing platform and various other applications", "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" }, - "version": "22.1.1~ynh1", + "version": "22.2.0~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", @@ -34,8 +34,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", @@ -45,8 +44,7 @@ }, { "name": "admin", - "type": "user", - "example": "homer" + "type": "user" }, { "name": "is_public", diff --git a/scripts/change_url b/scripts/change_url index f4f54a2..e4e3696 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -117,9 +117,9 @@ fi if [ $change_domain -eq 1 ] then # Check if .well-known is available for this domain - if is_url_handled --domain="$domain" --path="/.well-known/caldav" || is_url_handled --domain="$domain" --path="/.well-known/carddav" + 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 $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" diff --git a/scripts/install b/scripts/install index c36b120..8306846 100755 --- a/scripts/install +++ b/scripts/install @@ -305,13 +305,15 @@ ynh_multimedia_addaccess $app #================================================= # Fix app ownerships & permissions -chown -R $app: "$final_path" "$datadir" +chown -R $app:www-data "$final_path" +chown -R $app: "$datadir" find $final_path/ -type f -print0 | xargs -0 chmod 0644 find $final_path/ -type d -print0 | xargs -0 chmod 0755 find $datadir/ -type f -print0 | xargs -0 chmod 0640 find $datadir/ -type d -print0 | xargs -0 chmod 0750 chmod 640 "$final_path/config/config.php" chmod 755 /home/yunohost.app +chmod 750 $final_path #================================================= # SETUP LOGROTATE diff --git a/scripts/restore b/scripts/restore index 0449f5b..a3067d4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -131,13 +131,15 @@ mkdir -p "$datadir" #================================================= # Fix app ownerships & permissions -chown -R $app: "$final_path" "$datadir" +chown -R $app:www-data "$final_path" +chown -R $app: "$datadir" find $final_path/ -type f -print0 | xargs -0 chmod 0644 find $final_path/ -type d -print0 | xargs -0 chmod 0755 find $datadir/ -type f -print0 | xargs -0 chmod 0640 find $datadir/ -type d -print0 | xargs -0 chmod 0750 chmod 640 "$final_path/config/config.php" chmod 755 /home/yunohost.app +chmod 750 $final_path # Iterate over users to extend their home folder permissions - for the external # storage plugin usage - and create relevant Nextcloud directories diff --git a/scripts/upgrade b/scripts/upgrade index 8968143..8dfdcea 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -424,13 +424,15 @@ exec_occ background:cron #================================================= # Fix app ownerships & permissions -chown -R $app: "$final_path" "$datadir" +chown -R $app:www-data "$final_path" +chown -R $app: "$datadir" find $final_path/ -type f -print0 | xargs -0 chmod 0644 find $final_path/ -type d -print0 | xargs -0 chmod 0755 find $datadir/ -type f -print0 | xargs -0 chmod 0640 find $datadir/ -type d -print0 | xargs -0 chmod 0750 chmod 640 "$final_path/config/config.php" chmod 755 /home/yunohost.app +chmod 750 $final_path #================================================= # WARNING ABOUT THIRD-PARTY APPS diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 607191e..089cab2 100755 --- 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="22.1.1" +next_version="22.2.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="e55b6eb977fb539081e33a7d8f196e38430eb337cc76bf0379a663a497fbde5b" +nextcloud_source_sha256="273dba3ce43501b897e8b78996b50329e31da2b5402866ac20b318cdaddf3e1f"