Skip to content

Commit

Permalink
Testing (#769)
Browse files Browse the repository at this point in the history
* move function to common.sh (#764)

* move function to common.sh

* Update config

* add default_phone_region

* Update nginx.conf

* Update install

* Fix upgrade exploding when $app is nextcloud__2, __3 etc because the virtual apt/dpkg package is named with - and not _ (#767)

* Update upgrade

replace correct file for nextcloud--x-ynh-deps

* Update upgrade

correct syntax for the helpers

* Bump package revision

* Auto-update READMEs

* Patch (#768)

* remove inused patch with YNH 12

* reorder patch

* 30.0.5

* Auto-update READMEs

* Update restore

* Update upgrade (#777)

* Update upgrade

* Update manifest.toml

* Update manifest.toml

* Update post_user_delete (#778)

---------

Co-authored-by: Robles Rodolphe <rodolphe.robles@sfr.fr>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
  • Loading branch information
3 people authored Jan 30, 2025
1 parent 49c28ca commit 341f679
Show file tree
Hide file tree
Showing 16 changed files with 175 additions and 205 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD

The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud.

**Shipped version:** 30.0.4~ynh2
**Shipped version:** 30.0.5~ynh1

**Demo:** <https://demo.nextcloud.com/>

Expand Down
2 changes: 1 addition & 1 deletion README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD

The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud.

**Versión actual:** 30.0.4~ynh2
**Versión actual:** 30.0.5~ynh1

**Demo:** <https://demo.nextcloud.com/>

Expand Down
2 changes: 1 addition & 1 deletion README_eu.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD

The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud.

**Paketatutako bertsioa:** 30.0.4~ynh2
**Paketatutako bertsioa:** 30.0.5~ynh1

**Demoa:** <https://demo.nextcloud.com/>

Expand Down
2 changes: 1 addition & 1 deletion README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ L'adresse `/.well-known` sera automatiquement configuré pour la synchronisatio
Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud.


**Version incluse :** 30.0.4~ynh2
**Version incluse :** 30.0.5~ynh1

**Démo :** <https://demo.nextcloud.com/>

Expand Down
2 changes: 1 addition & 1 deletion README_gl.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD

The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud.

**Versión proporcionada:** 30.0.4~ynh2
**Versión proporcionada:** 30.0.5~ynh1

**Demo:** <https://demo.nextcloud.com/>

Expand Down
2 changes: 1 addition & 1 deletion README_id.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD

The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud.

**Versi terkirim:** 30.0.4~ynh2
**Versi terkirim:** 30.0.5~ynh1

**Demo:** <https://demo.nextcloud.com/>

Expand Down
2 changes: 1 addition & 1 deletion README_nl.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD

The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud.

**Geleverde versie:** 30.0.4~ynh2
**Geleverde versie:** 30.0.5~ynh1

**Demo:** <https://demo.nextcloud.com/>

Expand Down
2 changes: 1 addition & 1 deletion README_pl.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD

The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud.

**Dostarczona wersja:** 30.0.4~ynh2
**Dostarczona wersja:** 30.0.5~ynh1

**Demo:** <https://demo.nextcloud.com/>

Expand Down
2 changes: 1 addition & 1 deletion README_ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD

The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud.

**Поставляемая версия:** 30.0.4~ynh2
**Поставляемая версия:** 30.0.5~ynh1

**Демо-версия:** <https://demo.nextcloud.com/>

Expand Down
2 changes: 1 addition & 1 deletion README_zh_Hans.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD

The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud.

**分发版本:** 30.0.4~ynh2
**分发版本:** 30.0.5~ynh1

**演示:** <https://demo.nextcloud.com/>

Expand Down
2 changes: 1 addition & 1 deletion hooks/post_user_delete
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ php_version=$(ynh_app_setting_get --app=$app --key=php_version)

# Define a function to execute commands with `occ`
exec_occ() {
(cd "$install_dir" && ynh_exec_as_app \
(cd "$install_dir" && sudo -u $app \
php${php_version} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@")
}

Expand Down
6 changes: 3 additions & 3 deletions manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "30.0.4~ynh2"
version = "30.0.5~ynh1"

maintainers = ["kay0u"]

Expand Down Expand Up @@ -59,8 +59,8 @@ ram.runtime = "512M"
[resources.sources]

[resources.sources.main]
url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2'
sha256 = 'eb6aaba9acef442f2b3e4a996b7ee8a5ed24442f9bba681237fb28ed970e1fa5'
url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.5.tar.bz2'
sha256 = '248c6e6e612ceeeb170c4d25b8579b0af0e6613abdfa07f2fe6993426b781bea'

[resources.sources.29]
url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2'
Expand Down
29 changes: 0 additions & 29 deletions patches/main/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch

This file was deleted.

14 changes: 7 additions & 7 deletions scripts/restore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ ynh_script_progression "Restoring the app main directory..."

ynh_restore "$install_dir"

#=================================================
# RESTORE THE DATA DIRECTORY
#=================================================
ynh_script_progression "Restoring data directory..."

ynh_restore "$data_dir"

#=================================================
# RESTORE THE MYSQL DATABASE
#=================================================
Expand Down Expand Up @@ -64,13 +71,6 @@ ynh_script_progression "Restoring the logrotate configuration..."

ynh_restore "/etc/logrotate.d/$app"

#=================================================
# RESTORE THE DATA DIRECTORY
#=================================================
ynh_script_progression "Restoring data directory..."

ynh_restore "$data_dir"

#=================================================
# RESTORE USER RIGHTS
#=================================================
Expand Down
Loading

0 comments on commit 341f679

Please sign in to comment.