From 786ce573021881ddc387db7d6a8478dd46ca3328 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 14:08:31 +0200 Subject: [PATCH 01/12] Silence warnings --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index e6956e2..9e79847 100644 --- a/scripts/install +++ b/scripts/install @@ -129,7 +129,7 @@ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 # restart nginx and the whole webadmin and maybe even the yunohost command # running the install ... -ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies #================================================= # MODIFY A CONFIG FILE From 1b46fa631609c46fd7c677efca3e637d670e1425 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 14:15:03 +0200 Subject: [PATCH 02/12] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 352e27e..e9e2c88 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create and edit documents collaboratively", "fr": "Créez et éditer des documents collaborativement" }, - "version": "6.4.2~ynh1", + "version": "7.1.0~ynh1", "url": "https://www.onlyoffice.com", "upstream": { "license": "GPL-3.0-or-later", @@ -20,7 +20,7 @@ "email": "liberodark@gmail.com" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ From 56e55d0b5b4b17e6d32562fb58130c7ea3f31743 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 20 May 2022 12:15:09 +0000 Subject: [PATCH 03/12] 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 1789e1f..956aab3 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 Create and edit documents collaboratively -**Shipped version:** 6.4.2~ynh1 +**Shipped version:** 7.1.0~ynh1 **Demo:** https://www.onlyoffice.com/fr/download-desktop.aspx diff --git a/README_fr.md b/README_fr.md index fc821be..e66234a 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 Créez et éditer des documents collaborativement -**Version incluse :** 6.4.2~ynh1 +**Version incluse :** 7.1.0~ynh1 **Démo :** https://www.onlyoffice.com/fr/download-desktop.aspx From 671def2cbac67b76fc6ece0df26995a97bb81d05 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 14:16:32 +0200 Subject: [PATCH 04/12] Fix --- scripts/backup | 2 +- scripts/change_url | 2 +- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/backup b/scripts/backup index 9ca3edc..aa0bf53 100644 --- a/scripts/backup +++ b/scripts/backup @@ -65,4 +65,4 @@ ynh_psql_dump_db --database="$db_name" > db.sql # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for OnlyOffice. (YunoHost will then actually copy those files to the archive)." +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index d1742a8..3371f26 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -114,4 +114,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for OnlyOffice" +ynh_script_progression --message="Change of URL completed for $app" diff --git a/scripts/install b/scripts/install index 9e79847..bef44b3 100644 --- a/scripts/install +++ b/scripts/install @@ -195,4 +195,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of OnlyOffice completed" +ynh_script_progression --message="Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 82f2dc5..aaf7cab 100644 --- a/scripts/remove +++ b/scripts/remove @@ -107,4 +107,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of OnlyOffice completed" +ynh_script_progression --message="Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index d31dfe2..6769bc0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -149,4 +149,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for OnlyOffice" +ynh_script_progression --message="Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index b694eeb..c227292 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -178,4 +178,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of OnlyOffice completed" +ynh_script_progression --message="Upgrade of $app completed" From 4a6687be4bb020a2b5226614d61428d3fe79631a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 14:18:04 +0200 Subject: [PATCH 05/12] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index bef44b3..1fa9aeb 100644 --- a/scripts/install +++ b/scripts/install @@ -88,7 +88,7 @@ db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_psql_test_if_first_run -ynh_psql_setup_db --db_user=$db_name --db_name=$db_name +ynh_psql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # NGINX CONFIGURATION From 9169bbdfdd48978849050376fde7a5c82b3c4fd6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 14:28:23 +0200 Subject: [PATCH 06/12] Fix --- scripts/install | 2 +- scripts/remove | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 1fa9aeb..8387958 100644 --- a/scripts/install +++ b/scripts/install @@ -129,7 +129,7 @@ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 # restart nginx and the whole webadmin and maybe even the yunohost command # running the install ... -ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies +ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies 2>/dev/null #================================================= # MODIFY A CONFIG FILE diff --git a/scripts/remove b/scripts/remove index aaf7cab..2e897fe 100644 --- a/scripts/remove +++ b/scripts/remove @@ -55,7 +55,6 @@ ynh_script_progression --message="Removing dependencies..." # Remove metapackage and its dependencies ynh_remove_app_dependencies -#ynh_remove_extra_repo dpkg --configure -a From 30c0f03c7c83fa6a53aaf0d722d30bc8a07b479e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 14:43:16 +0200 Subject: [PATCH 07/12] Fix --- scripts/_common.sh | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 11faf8f..be1de98 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib libstdc++6 rabbitmq-server libcurl4-dev" -extra_dependencies="onlyoffice-documentserver" +extra_dependencies="onlyoffice-documentserver ttf-mscorefonts-installer" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 8387958..866c5fe 100644 --- a/scripts/install +++ b/scripts/install @@ -122,7 +122,7 @@ echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set- #================================================= ynh_script_progression --message="Install OnlyOffice..." -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 +apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 2>/dev/null # The onlyoffice dev had the magnificent idea to add a "nginx restart" during # the install/configure of their package, which is awful since that will From 9d2c558edf9ba32d214fba92378d39b038a0bb04 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 14:45:13 +0200 Subject: [PATCH 08/12] Update remove --- scripts/remove | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/remove b/scripts/remove index 2e897fe..b53a4ac 100644 --- a/scripts/remove +++ b/scripts/remove @@ -37,8 +37,8 @@ ynh_secure_remove --file=/var/lib/dpkg/info/onlyoffice-documentserver.prerm # already removed ... so their removal fails which breaks dpkg. # So instead, we trick it with this stupid link to /bin/true which is removed # right after. -ln -s /bin/true /usr/local/bin/supervisorctl -ynh_package_autopurge onlyoffice-documentserver +#ln -s /bin/true /usr/local/bin/supervisorctl +ynh_package_autopurge "onlyoffice-documentserver ttf-mscorefonts-installer" #================================================= # REMOVE THE POSTGRESQL DATABASE From d6f08bf225c0731401803797e644028257514408 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 14:46:01 +0200 Subject: [PATCH 09/12] Update remove --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index b53a4ac..aa85a24 100644 --- a/scripts/remove +++ b/scripts/remove @@ -58,7 +58,7 @@ ynh_remove_app_dependencies dpkg --configure -a -apt-key del "E09C A29F 6E17 8040 EF22 B409 8320 CA65 CB2D E8E5" +apt-key del "E09C A29F 6E17 8040 EF22 B409 8320 CA65 CB2D E8E5" 2>/dev/null #================================================= # REMOVE APP MAIN DIR From ce9e809ee3005a0981c7a9a8019ed708240dc722 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 14:48:00 +0200 Subject: [PATCH 10/12] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index be1de98..11faf8f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib libstdc++6 rabbitmq-server libcurl4-dev" -extra_dependencies="onlyoffice-documentserver ttf-mscorefonts-installer" +extra_dependencies="onlyoffice-documentserver" #================================================= # PERSONAL HELPERS From d71a4615bfbd91fa2f14daa7955befd28638ac33 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 15:00:38 +0200 Subject: [PATCH 11/12] Update remove --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index aa85a24..1a93505 100644 --- a/scripts/remove +++ b/scripts/remove @@ -38,7 +38,7 @@ ynh_secure_remove --file=/var/lib/dpkg/info/onlyoffice-documentserver.prerm # So instead, we trick it with this stupid link to /bin/true which is removed # right after. #ln -s /bin/true /usr/local/bin/supervisorctl -ynh_package_autopurge "onlyoffice-documentserver ttf-mscorefonts-installer" +ynh_package_autopurge "onlyoffice-documentserver" #================================================= # REMOVE THE POSTGRESQL DATABASE From 79b185501d563707da9dd3c9847f8fb10511d707 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 20 May 2022 15:04:16 +0200 Subject: [PATCH 12/12] Update remove --- scripts/remove | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/remove b/scripts/remove index 1a93505..4cced44 100644 --- a/scripts/remove +++ b/scripts/remove @@ -38,7 +38,7 @@ ynh_secure_remove --file=/var/lib/dpkg/info/onlyoffice-documentserver.prerm # So instead, we trick it with this stupid link to /bin/true which is removed # right after. #ln -s /bin/true /usr/local/bin/supervisorctl -ynh_package_autopurge "onlyoffice-documentserver" +ynh_package_autopurge onlyoffice-documentserver #================================================= # REMOVE THE POSTGRESQL DATABASE @@ -86,7 +86,6 @@ ynh_script_progression --message="Removing file..." # Remove a directory securely ynh_secure_remove --file="/etc/onlyoffice" ynh_secure_remove --file="/var/lib/onlyoffice" -#ynh_secure_remove --file="/var/cache/nginx/onlyoffice" # Remove the log files ynh_secure_remove --file="/var/log/$app"