diff --git a/README.md b/README.md index fb90e04..6a94b00 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Collabora for YunoHost -[![Integration level](https://dash.yunohost.org/integration/collabora.svg)](https://dash.yunohost.org/appci/app/collabora) +[![Integration level](https://dash.yunohost.org/integration/collabora.svg)](https://dash.yunohost.org/appci/app/collabora) ![](https://ci-apps.yunohost.org/ci/badges/collabora.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/collabora.maintain.svg) [![Install Collabora with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=collabora) > *This package allow you to install Collabora quickly and simply on a YunoHost server. @@ -8,7 +8,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview -[Collabora](https://www.collaboraoffice.com/code/) is an online office suite usable with Nextcloud or Owncloud +[Collabora](https://www.collaboraoffice.com/code/) is an online office suite usable with Nextcloud or ownCloud **Shipped version:** 4.0.0 RC2 @@ -22,13 +22,13 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Documentation * Official documentation: https://www.collaboraoffice.com/code/ - * YunoHost documentation: https://github.com/YunoHost/doc/blob/master/collabora_en.md + * YunoHost documentation: https://yunohost.org/#/app_collabora #### Multi-users support #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/collabora%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/collabora/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/collabora%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/collabora/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/collabora%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/collabora/) ## Limitations @@ -41,7 +41,7 @@ CODE has a warning limitation ## Additionnal informations **Upgrade this package:** -You can use your Yunohost admin interface, or the command line: `sudo yunohost app upgrade --debug collabora -u https://github.com/YunoHost-Apps/collabora_ynh` +You can use your YunoHost admin interface, or the command line: `sudo yunohost app upgrade --debug collabora -u https://github.com/YunoHost-Apps/collabora_ynh` ## Links @@ -52,8 +52,7 @@ You can use your Yunohost admin interface, or the command line: `sudo yunohost a --- -Developers infos ----------------- +## Developers infos Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/collabora_ynh/tree/testing). diff --git a/manifest.json b/manifest.json index d0b2743..78b1e6c 100644 --- a/manifest.json +++ b/manifest.json @@ -3,16 +3,15 @@ "id": "collabora", "packaging_format": 1, "description": { - "en": "A LibreOffice-based online office suite with collaborative editing", - "fr": "Une suite office en ligne et collaborative, basée sur LibreOffice" + "en": "LibreOffice-based online office suite with collaborative editing", + "fr": "Suite office en ligne et collaborative, basée sur LibreOffice" }, "version": "4.0.0~ynh1", - "url": "https://www.libreoffice.org/download/libreoffice-online/", + "url": "https://collaboraoffice.com", "license": "MPL-2.0", "maintainer": { "name": "rafi59", "email": "rafi59_dev@srvmaison.fr.nf", - "url": "https://collaboraoffice.com" }, "requirements": { "yunohost": ">= 3.5" @@ -32,9 +31,7 @@ }, "example": "example.com" }, - - - { + { "name": "password", "type": "password", "ask": { @@ -42,21 +39,17 @@ "fr": "Choisissez un mot de passe pour l'administration de Collabora" }, "example": "password" - }, - { + { "name": "nextcloud_domain", "type": "string", "ask": { "en": "The domain of your Nextcloud instance", "fr": "Le domain de votre instance Nextcloud" }, - "example": "example.com", + "example": "example.com/nextcloud", "default": "" - - } - - + } ] } } diff --git a/scripts/backup b/scripts/backup index faf1df7..5591094 100644 --- a/scripts/backup +++ b/scripts/backup @@ -30,11 +30,13 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_print_info --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -43,7 +45,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP CONFIGURATION #================================================= -ynh_print_info --message="Backing up configuration..." ynh_backup --src_path="/etc/loolwsd/loolwsd.xml" diff --git a/scripts/install b/scripts/install index 3fe4456..1d5aac7 100644 --- a/scripts/install +++ b/scripts/install @@ -79,9 +79,9 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # NGINX CONFIGURATION #================================================= -ynh_print_info --message="Configuring nginx web server..." +ynh_print_info --message="Configuring NGINX web server..." -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -126,7 +126,7 @@ ynh_app_setting_set $app unprotected_uris "/" #================================================= # RELOAD NGINX #================================================= -ynh_print_info --message="Reloading nginx web server..." +ynh_print_info --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 32fdf2c..91f4ab2 100644 --- a/scripts/remove +++ b/scripts/remove @@ -36,9 +36,9 @@ ynh_remove_app_dependencies #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_print_info --message="Removing nginx web server configuration..." +ynh_print_info --message="Removing NGINX web server configuration..." -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= diff --git a/scripts/restore b/scripts/restore index acd3a7d..e6f9332 100644 --- a/scripts/restore +++ b/scripts/restore @@ -84,7 +84,7 @@ ynh_systemd_action --service_name="loolwsd" --action="restart" --log_path="syste #================================================= # RELOAD NGINX #================================================= -ynh_print_info --message="Reloading nginx web server..." +ynh_print_info --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 7dd9116..34415b4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -129,7 +129,7 @@ ynh_systemd_action --service_name="loolwsd" --action="restart" --log_path="syste #================================================= # RELOAD NGINX #================================================= -ynh_print_info --message="Reloading nginx web server..." +ynh_print_info --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload