From 742a5e5312fae55cc39d2506a36bf140d3da2ba8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 12 Apr 2021 09:38:24 +0200 Subject: [PATCH] Remove is_public --- README.md | 4 ++-- README_fr.md | 4 ++-- check_process | 1 - manifest.json | 16 ++-------------- scripts/install | 1 - scripts/upgrade | 10 ---------- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 327c313..d0011b1 100644 --- a/README.md +++ b/README.md @@ -88,8 +88,8 @@ Prerequisite: **OnlyOffice should be public**, see previous section. #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/onlyoffice%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/onlyoffice/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/onlyoffice%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/onlyoffice/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/onlyoffice.svg)](https://ci-apps.yunohost.org/ci/apps/onlyoffice/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/onlyoffice.svg)](https://ci-apps-arm.yunohost.org/ci/apps/onlyoffice/) ## Links diff --git a/README_fr.md b/README_fr.md index 48e8340..f34e0b2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -88,8 +88,8 @@ Prérequis : **OnlyOffice doit être public**, voir la section précédente. #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/onlyoffice%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/onlyoffice/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/onlyoffice%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/onlyoffice/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/onlyoffice.svg)](https://ci-apps.yunohost.org/ci/apps/onlyoffice/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/onlyoffice.svg)](https://ci-apps-arm.yunohost.org/ci/apps/onlyoffice/) ## Liens diff --git a/check_process b/check_process index abb7748..71ee0f4 100644 --- a/check_process +++ b/check_process @@ -19,7 +19,6 @@ upgrade=1 backup_restore=1 multi_instance=0 - port_already_use=0 change_url=1 ;;; Options Email= diff --git a/manifest.json b/manifest.json index 956cd2e..476a129 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.1.0~ynh1", + "version": "6.1.0~ynh2", "url": "https://www.onlyoffice.com", "license": "GPL-3.0-or-later", "maintainer": { @@ -14,7 +14,7 @@ "email": "liberodark@gmail.com" }, "requirements": { - "yunohost": ">= 3.8.4" + "yunohost": ">= 4.1.7" }, "multi_instance": false, "services": [ @@ -25,10 +25,6 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for OnlyOffice", - "fr": "Choisissez un nom de domaine pour OnlyOffice" - }, "example": "office.yunohost.domain", "help": { "en": "You should not install OnlyOffice on your main YunoHost domain, especially if you want to use it with a Nextcloud installed on the same domain.", @@ -38,10 +34,6 @@ { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for OnlyOffice", - "fr": "Choisissez un chemin pour OnlyOffice" - }, "example": "/onlyoffice or /", "help": { "en": "Root path / if you chose a subdomain, e.g. office.yunohost.domain.", @@ -66,10 +58,6 @@ { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application? If you want to connect the app to Nextcloud: check/true!", - "fr": "Est-ce une application publique ? Si vous voulez connecter l'app à Nextcloud : cochez/true!" - }, "help": { "en": "You will only be able to connect OnlyOffice to Nextcloud if both apps are public!", "fr": "Nextcloud et OnlyOffice doivent être des applications publiques si vous voulez les connecter !" diff --git a/scripts/install b/scripts/install index 1988fdd..e698904 100644 --- a/scripts/install +++ b/scripts/install @@ -45,7 +45,6 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public ynh_app_setting_set --app=$app --key=nextclouddomain --value=$nextclouddomain ynh_app_setting_set --app=$app --key=final_path --value=$final_path diff --git a/scripts/upgrade b/scripts/upgrade index 8c4da48..c16be72 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) @@ -30,15 +29,6 @@ nextclouddomain=$(ynh_app_setting_get --app=$app --key=nextclouddomain) #================================================= 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 "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app)