YunoHost-Apps/diagramsnet_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/diagramsnet_ynh.git synced 2024-09-03 18:26:33 +02:00
Code Issues Activity Actions

Merge from testing (#17)

Browse source 
* 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)

* Upgrade to upstream 13.2.5

* V.14.1.1 (#10)

* Testing (#8)

* 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>

* Upgrade to upstream version

Co-authored-by: Gofannon <17145502+Gofannon@users.noreply.github.com>
Co-authored-by: quentin-abiterra <49190209+quentin-abiterra@users.noreply.github.com>

* Upgrade to upstream v14.4.0 (#12)

* Upgrade to version 14.4.4 (#15)

* Upgrade to version 14.4.0 (#13)

* 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)

* Upgrade to upstream 13.2.5

* V.14.1.1 (#10)

* Testing (#8)

* 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>

* Upgrade to upstream version

Co-authored-by: Gofannon <17145502+Gofannon@users.noreply.github.com>
Co-authored-by: quentin-abiterra <49190209+quentin-abiterra@users.noreply.github.com>

* Upgrade to upstream v14.4.0 (#12)

Co-authored-by: quentin-abiterra <49190209+quentin-abiterra@users.noreply.github.com>
Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* [fix] migrate to new permission system

* [enh] add CI test for new permission system

* Upgrade to version 14.4.4

* Cleaning up

Co-authored-by: Gofannon <17145502+Gofannon@users.noreply.github.com>
Co-authored-by: quentin-abiterra <49190209+quentin-abiterra@users.noreply.github.com>

Co-authored-by: quentin-abiterra <49190209+quentin-abiterra@users.noreply.github.com>
Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
Co-authored-by: ericgaspar <junk.eg@free.fr>
This commit is contained in:
Gofannon 2021-04-18 17:21:13 +02:00 committed by GitHub
parent 9e0c1be11d
commit 00e6d54b67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 38 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
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. 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:** 14.4.0 **Shipped version:** 14.4.4
## Screenshots ## Screenshots

6
check_process
View file

@ -11,7 +11,7 @@
setup_private=1 setup_private=1
setup_public=1 setup_public=1
upgrade=1 upgrade=1
#upgrade=1 from_commit=CommitHash upgrade=1 from_commit=9e0c1be11dfe6485ab66f898494eff5bd6bac817
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
change_url=1 change_url=1
@ -19,7 +19,7 @@
Email= Email=
Notification=none Notification=none
;;; Upgrade options ;;; Upgrade options
; commit=CommitHash ; commit=9e0c1be11dfe6485ab66f898494eff5bd6bac817
name=Name and date of the commit. name=Upgrade to version 14.4.0 (#13)
manifest_arg=domain=DOMAIN&path=PATH&is_public=1 manifest_arg=domain=DOMAIN&path=PATH&is_public=1

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/jgraph/drawio/archive/v14.4.0.tar.gz SOURCE_URL=https://github.com/jgraph/drawio/archive/v14.4.4.tar.gz
SOURCE_SUM=a3bec714651eb421ecbf81e25171da2e7dc834cefb4119ecb3842a45e4f554d6 SOURCE_SUM=a310355c75e5b2c15dbe96ff97dc64fe911f4508d426f26aa3a2ef63fad3174b
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

16
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams.", "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." "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel."
}, },
"version": "14.4.0~ynh1", "version": "14.4.4~ynh1",
"url": "https://www.diagrams.net/", "url": "https://www.diagrams.net/",
"license": "Apache-2.0", "license": "Apache-2.0",
"maintainer": { "maintainer": {
@ -14,7 +14,7 @@
"email": "gofannon@riseup.net" "email": "gofannon@riseup.net"
}, },
"requirements": { "requirements": {
"yunohost": ">= 3.8.1" "yunohost": ">= 4.1.7"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
@ -25,29 +25,17 @@
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain",
"ask": {
"en": "Choose a domain name for Diagrams.net",
"fr": "Choisissez un nom de domaine pour Diagrams.net"
},
"example": "example.com" "example": "example.com"
}, },
{ {
"name": "path", "name": "path",
"type": "path", "type": "path",
"ask": {
"en": "Choose a path for Diagrams.net",
"fr": "Choisissez un chemin pour Diagrams.net"
},
"example": "/diagram", "example": "/diagram",
"default": "/diagram" "default": "/diagram"
}, },
{ {
"name": "is_public", "name": "is_public",
"type": "boolean", "type": "boolean",
"ask": {
"en": "Is it a public application?",
"fr": "Est-ce une application publique ?"
},
"default": false "default": false
} }
] ]

4
pull_request_template.md
View file

@ -13,6 +13,4 @@
## Package_check results ## 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* * 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!"*
[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/diagramsnet_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/diagramsnet_ynh%20PR-NUM-%20(USERNAME)/)

12
scripts/install
View file

@ -48,7 +48,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2
ynh_app_setting_set --app=$app --key=domain --value=$domain 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=path --value=$path_url
ynh_app_setting_set --app=$app --key=is_public --value=$is_public
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
@ -61,7 +60,7 @@ ynh_setup_source --dest_dir="$final_path"
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Configuring nginx web server..." --weight=15 ynh_script_progression --message="Configuring NGINX web server..." --weight=15
# Create a dedicated nginx config # Create a dedicated nginx config
ynh_add_nginx_config ynh_add_nginx_config
@ -88,19 +87,20 @@ chown -R root: $final_path
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================
ynh_script_progression --message="Configuring SSOwat..." --weight=3 ynh_script_progression --message="Configuring permissions..." --weight=3
# Make app public if necessary # Make app public if necessary
if [ $is_public -eq 1 ] if [ $is_public -eq 1 ]
then then
# unprotected_uris allows SSO credentials to be passed anyway. # Everyone can access the app.
ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" # The "main" permission is automatically created before the install script.
ynh_permission_update --permission="main" --add="visitors"
fi fi
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX
#================================================= #=================================================
ynh_script_progression --message="Reloading nginx web server..." --weight=1 ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload ynh_systemd_action --service_name=nginx --action=reload

4
scripts/remove
View file

@ -16,8 +16,6 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
#================================================= #=================================================
@ -31,7 +29,7 @@ ynh_secure_remove --file="$final_path"
#================================================= #=================================================
# REMOVE NGINX CONFIGURATION # REMOVE NGINX CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Removing nginx web server configuration..." --weight=1 ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
# Remove the dedicated nginx config # Remove the dedicated nginx config
ynh_remove_nginx_config ynh_remove_nginx_config

2
scripts/restore
View file

@ -69,7 +69,7 @@ chown -R root: $final_path
#================================================= #=================================================
# RELOAD NGINX AND PHP-FPM # RELOAD NGINX AND PHP-FPM
#================================================= #=================================================
ynh_script_progression --message="Reloading nginx web server .." --weight=2 ynh_script_progression --message="Reloading NGINX web server .." --weight=2
ynh_systemd_action --service_name=nginx --action=reload ynh_systemd_action --service_name=nginx --action=reload

51
scripts/upgrade
View file

@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path) path_url=$(ynh_app_setting_get --app=$app --key=path)
is_public=$(ynh_app_setting_get --app=$app --key=is_public)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
#================================================= #=================================================
@ -27,6 +26,18 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
upgrade_type=$(ynh_check_app_version_changed) upgrade_type=$(ynh_check_app_version_changed)
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
#=================================================
ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
# Cleaning legacy permissions
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 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#================================================= #=================================================
@ -41,7 +52,6 @@ ynh_clean_setup () {
# Exit if an error occurs during the execution of the script # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
#================================================= #=================================================
@ -54,22 +64,7 @@ then
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$final_path"
fi
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=17
# Create a dedicated nginx config
ynh_add_nginx_config
#=================================================
# REMOVE CALLS TO THIRD PARTY WEBSITES
#=================================================
if [ "$upgrade_type" == "UPGRADE_APP" ]
then
# Add "offline" parameter in index.html # Add "offline" parameter in index.html
# See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- # See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported-
# and https://shelter.moe/@Neil/103928506546498078 [French] # and https://shelter.moe/@Neil/103928506546498078 [French]
@ -77,6 +72,14 @@ then
sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html"
fi fi
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=17
# Create a dedicated nginx config
ynh_add_nginx_config
#================================================= #=================================================
# SECURE FILES AND DIRECTORIES # SECURE FILES AND DIRECTORIES
#================================================= #=================================================
@ -84,22 +87,10 @@ fi
# Set permissions on app files # Set permissions on app files
chown -R root: $final_path chown -R root: $final_path
#=================================================
# SETUP SSOWAT
#=================================================
ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=3
# Make app public if necessary
if [ $is_public -eq 1 ]
then
# unprotected_uris allows SSO credentials to be passed anyway
ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
fi
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX
#================================================= #=================================================
ynh_script_progression --message="Reloading nginx web server..." --weight=1 ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload ynh_systemd_action --service_name=nginx --action=reload