From fceb70b470a4ba5409da12a9c7c5856c5a57d340 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Fri, 3 Jul 2020 21:20:00 +0200 Subject: [PATCH] Testing (#8) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Upgrade to version 12.9.3 * Update README.md Small update on the link's demo. We don't know how long they gonna redirect draw.io to app.diagrams.net * Remove commented code unused * Force http parameter to disable 3rds parties * fix quotting * Documentation * Upgrade version to 12.9.7 * Update README.md (#9) Co-authored-by: quentin-abiterra <49190209+quentin-abiterra@users.noreply.github.com> Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --- CHANGELOG.md | 15 +++++++++++++++ README.md | 18 +++++++----------- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 10 ++++++++++ scripts/upgrade | 23 +++++++++-------------- 6 files changed, 44 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86916a9..5e2e27c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## Unreleased + +## [12.9.7~ynh1] - 2020-04-05 + +### Added +- Disable third party website integration with Dropbox, Google, Trello, etc. [See this explanation in french](https://shelter.moe/@Neil/103928506546498078) + +### Changed +- upgrade source to upstream + +## [12.9.3~ynh1] - 2020-03-27 + +### Changed +- upgrade source to upstream + ## [12.8.2~ynh2] - 2020-03-27 ### Fixed diff --git a/README.md b/README.md index 9f1adfb..5a550c7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# diagrams.net package for YunoHost; formerly draw.io +# diagrams.net for YunoHost -[![Integration level](https://dash.yunohost.org/integration/diagramsnet.svg)](https://dash.yunohost.org/appci/app/diagramsnet) +[![Integration level](https://dash.yunohost.org/integration/diagramsnet.svg)](https://dash.yunohost.org/appci/app/diagramsnet) ![](https://ci-apps.yunohost.org/ci/badges/diagramsnet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/diagramsnet.maintain.svg) [![Install diagramsnet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=diagramsnet) > *This package allow you to install diagrams.net quickly and simply on a YunoHost server. @@ -8,9 +8,9 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview -diagrams.net lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams. +diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams. -**Shipped version:** 12.8.3 +**Shipped version:** 12.9.7 ## Screenshots @@ -18,7 +18,7 @@ diagrams.net lets you create a wide range of diagrams, from simple tree and flow ## Demo -* [Official demo](https://www.draw.io) +* [Official demo](https://app.diagrams.net/) ## Documentation @@ -26,11 +26,11 @@ diagrams.net lets you create a wide range of diagrams, from simple tree and flow ## YunoHost specific features -Later, it might be interresting to see how to integrate this app with NextCloud or DokuWiki +* Disable third party website integration with Dropbox, Google, Trello, etc ### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/diagramsnet%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/diagramsnet/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/diagramsnet%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/diagramsnet/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/diagramsnet%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/diagramsnet/) ## Limitations @@ -41,9 +41,6 @@ Later, it might be interresting to see how to integrate this app with NextCloud * Other information you would add about this application -**More information on the documentation page:** -https://yunohost.org/packaging_apps - ## Links * Report a bug: @@ -55,7 +52,6 @@ https://yunohost.org/packaging_apps ## Developers info -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/diagramsnet_ynh/tree/testing). To try the testing branch, please proceed like that. diff --git a/conf/app.src b/conf/app.src index 79706fb..4c767ef 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v12.8.3.tar.gz -SOURCE_SUM=4db12442091550c89c9ec876a0600385c2ad896fa8cd293db206fdf9cfe79529 +SOURCE_URL=https://github.com/jgraph/drawio/archive/v12.9.7.tar.gz +SOURCE_SUM=8190a4c4a0746d50ed48080f41a5f91c97047f5cd0a889c6d8d0681b8e937a16 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 52fc1b6..669232a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams.", "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel." }, - "version": "12.8.3~ynh2", + "version": "12.9.7~ynh1", "url": "https://www.diagrams.net/", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/install b/scripts/install index 4a6e8fb..3e3064e 100644 --- a/scripts/install +++ b/scripts/install @@ -66,6 +66,16 @@ ynh_script_progression --message="Configuring nginx web server..." --weight=15 # Create a dedicated nginx config ynh_add_nginx_config +#================================================= +# REMOVE CALLS TO THIRD PARTY WEBSITES +#================================================= + +# Add "offline" parameter in index.html +# See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- +# and https://shelter.moe/@Neil/103928506546498078 [French] +sed_pattern="s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g" +sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c974aa8..d15dfd0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,22 +71,17 @@ ynh_script_progression --message="Upgrading nginx web server configuration..." - ynh_add_nginx_config #================================================= -# SETUP LOGROTATE +# REMOVE CALLS TO THIRD PARTY WEBSITES #================================================= -#ynh_script_progression --message="Upgrading logrotate configuration..." --time --weight=1 -# Use logrotate to manage app-specific logfile(s) -#ynh_use_logrotate --non-append - -#================================================= -# GENERIC FINALIZATION -#================================================= -# UPGRADE FAIL2BAN -#================================================= -#ynh_script_progression --message="Reconfiguring fail2ban..." --time --weight=1 - -# Create a dedicated fail2ban config -#ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login" +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + # Add "offline" parameter in index.html + # See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- + # and https://shelter.moe/@Neil/103928506546498078 [French] + sed_pattern="s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g" + sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" +fi #================================================= # SECURE FILES AND DIRECTORIES