diff --git a/README.md b/README.md index 83adeac..2b43238 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to [Collabora](https://www.collaboraoffice.com/code/) is an online office suite usable with Nextcloud. -**Shipped version:** 4.0.0 RC2 +**Shipped version:** 6.4.4 ## Screenshots diff --git a/conf/loolwsd.xml b/conf/loolwsd.xml index d1c74b1..06b91b5 100644 --- a/conf/loolwsd.xml +++ b/conf/loolwsd.xml @@ -3,27 +3,41 @@ - - - - + de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru - + + + + + - + 1 4 + 5 + + false 3600 - 30 - 300 - 0 - 0 + + 30 + 300 + false + 0 8000 0 0 + 100 + 100 + + 10000 + 60 + 300 + 3072 + 85 + @@ -36,7 +50,12 @@ true warning + false + + -INFO-WARN + /var/log/loolwsd.log never timestamp @@ -46,12 +65,16 @@ true false + + false + 82589933 + false - /tmp/looltrace-%.gz + @@ -60,12 +83,33 @@ + + + all + any + + + + 192\.168\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3} + 127\.0\.0\.1 + ::ffff:127\.0\.0\.1 + ::1 + 172\.17\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:172\.17\.[0-9]{1,3}\.[0-9]{1,3} + + + + + - false - true + false + false /etc/loolwsd/cert.pem /etc/loolwsd/key.pem /etc/loolwsd/ca-chain.cert.pem + 1000 @@ -75,6 +119,26 @@ + + true + true + + + + + + + + + true + false + + + + + classic + + @@ -86,17 +150,34 @@ 192\.168\.[0-9]{1,3}\.[0-9]{1,3} 192\.168\.1\.1 0 + false + + 900 + __NEXTCLOUD_DOMAIN__ + + true + + + + + + true - admin - __PASSWORD__ + true + false + admin + __PASSWORD__ + + + diff --git a/manifest.json b/manifest.json index f0ba25a..937b0fc 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "LibreOffice-based online office suite with collaborative editing", "fr": "Suite office en ligne et collaborative, basée sur LibreOffice" }, - "version": "4.0.0~ynh2", + "version": "6.4.4~ynh1", "url": "https://collaboraoffice.com", "license": "MPL-2.0", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md index f6155d6..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -13,6 +13,4 @@ ## Package_check results --- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/collabora_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/collabora_ynh%20PR-NUM-%20(USERNAME)/) +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/install b/scripts/install index 3478e2a..8f75917 100644 --- a/scripts/install +++ b/scripts/install @@ -87,9 +87,6 @@ ynh_script_progression --message="Configuring NGINX web server..." # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# SPECIFIC SETUP -#================================================= #================================================= # GENERIC FINALIZATION #================================================= @@ -104,11 +101,11 @@ ynh_systemd_action --service_name="loolwsd" --action="restart" --log_path="syste #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." +ynh_script_progression --message="Configuring permissions..." # Make app public # unprotected_uris allows SSO credentials to be passed anyway. -ynh_app_setting_set $app unprotected_uris "/" +ynh_permission_update --permission="main" --add="visitors" --show_tile="false" #================================================= # RELOAD NGINX diff --git a/scripts/upgrade b/scripts/upgrade index e755dff..d2a5fe4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -42,6 +42,12 @@ if [ -z "$path_url" ]; then ynh_app_setting_set --app=$app --key=path_url --value=$path_url fi +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -93,15 +99,6 @@ ynh_add_config "../conf/loolwsd.xml" "/etc/loolwsd/loolwsd.xml" #================================================= # GENERIC FINALIZATION -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." - -# Make app public -# unprotected_uris allows SSO credentials to be passed anyway -ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" - #================================================= # START SYSTEMD SERVICE #=================================================