diff --git a/conf/app.src b/conf/app.src index 4d7ae8e..f5ae051 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ondras/my-mind/archive/v1.2.tar.gz -SOURCE_SUM=b1cfc9bf97bd6b073346f52a789cdafedc4d29f0d8bd4e646f7998392c1a8647 +SOURCE_URL=https://github.com/ondras/my-mind/archive/v2.0.tar.gz +SOURCE_SUM=0ea718f800c2e778cd649132fcfd9c9836815258733295e4998a44e9d91be7a7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 8ae9b5b..d0d23de 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.html index.php; #client_max_body_size 50M; diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..3547490 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +My Mind is a web application for creating and managing Mind maps. It is free to use and you can fork its source code. \ No newline at end of file diff --git a/manifest.json b/manifest.json index db00cfc..ef7fd69 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online Mindmapping Software", "fr": "Éditeur de cartes mentales" }, - "version": "1.2~ynh3", + "version": "2.0~ynh1", "url": "https://github.com/ondras/my-mind", "upstream": { "license": "MIT", @@ -23,7 +23,7 @@ "url": "https://datamol.org" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -34,13 +34,12 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", "type": "path", - "example": "/example", + "example": "/mymind", "default": "/mymind" }, { diff --git a/scripts/install b/scripts/install index 1fe51c7..d6ae546 100644 --- a/scripts/install +++ b/scripts/install @@ -13,6 +13,11 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + ### Remove this function if there's nothing to clean before calling the remove script. + true +} +# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= @@ -22,6 +27,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC +phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/restore b/scripts/restore index 495ed87..0596c8e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -14,6 +14,11 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + ### Remove this function if there's nothing to clean before calling the remove script. + true +} +# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ada1a2e..ebc515e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,7 +19,8 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +phpversion=$YNH_PHP_VERSION + #================================================= # CHECK VERSION #=================================================