From 59188a4c5ff9b686114fe8e32e28bc37263def10 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Jun 2021 23:33:37 +0200 Subject: [PATCH] Fix --- check_process | 8 +------- manifest.json | 2 +- scripts/install | 2 +- scripts/upgrade | 12 +----------- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/check_process b/check_process index 68361f7..55387ca 100644 --- a/check_process +++ b/check_process @@ -1,11 +1,6 @@ -# See here for more informations -# https://github.com/YunoHost/package_check#syntax-check_process-file - -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) + domain="domain.tld" password="pass" nextcloud_domain="nextcloud.tld" ; Checks @@ -18,7 +13,6 @@ upgrade=1 backup_restore=1 multi_instance=0 - port_already_use=0 change_url=0 ;;; Options Email= diff --git a/manifest.json b/manifest.json index 937b0fc..6848ea7 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "rafi59_dev@srvmaison.fr.nf" }, "requirements": { - "yunohost": ">= 4.1.4.3" + "yunohost": ">= 4.2.4" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index 339e753..e8afb1f 100644 --- a/scripts/install +++ b/scripts/install @@ -74,7 +74,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port # config directory which of course doesn't exists and we want to disable SSL # because we're in a reverse proxy context... mkdir -p /etc/loolwsd -ynh_add_config ../conf/loolwsd.xml /etc/loolwsd/loolwsd.xml +ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml" #================================================= # INSTALL DEPENDENCIES diff --git a/scripts/upgrade b/scripts/upgrade index d2a5fe4..4dcafaf 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,15 +27,6 @@ nextcloud_domain=$(ynh_app_setting_get --app="$app" --key=nextcloud_domain) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -# Fix is_public as a boolean value -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=1 - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=0 - is_public=0 -fi - # If db_name doesn't exist, create it if [ -z "$path_url" ]; then path_url="/" @@ -86,7 +77,6 @@ ynh_add_nginx_config ynh_script_progression --message="Upgrading dependencies..." DEBIAN_VERSION_NUMBER=$(cat /etc/debian_version | head -n 1 | cut -f1 -d .) - ynh_install_extra_app_dependencies --repo="deb https://collaboraoffice.com/repos/CollaboraOnline/CODE-debian${DEBIAN_VERSION_NUMBER} ./ " --package="$pkg_dependencies" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x0C54D189F4BA284D" #================================================= @@ -95,7 +85,7 @@ ynh_install_extra_app_dependencies --repo="deb https://collaboraoffice.com/repos # UPGRADE CONFIG #================================================= -ynh_add_config "../conf/loolwsd.xml" "/etc/loolwsd/loolwsd.xml" +ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml" #================================================= # GENERIC FINALIZATION