diff --git a/manifest.json b/manifest.json index cc13269..ae06694 100644 --- a/manifest.json +++ b/manifest.json @@ -9,17 +9,17 @@ "version": "0.2~ynh1", "url": "https://dont-code.net", "upstream": { - "license": "free", + "license": "AGPL-3.0-or-later", "website": "https://dont-code.net", "demo": "https://dont-code.net/apps.html", "admindoc": "https://dont-code.net/developers.html", "userdoc": "https://dont-code.net/news.html", "code": "https://github.com/dont-code" }, - "license": "free", + "license": "AGPL-3.0-or-later", "maintainer": { - "name": "Gerard Collin", - "email": "ger@collin.best" + "name": "Dont-code Team", + "email": "developer@dont-code.net" }, "requirements": { "yunohost": ">= 11.0.0" @@ -44,7 +44,7 @@ { "name": "public_key", "type": "string", - "optional": "true", + "optional": true, "ask": { "en": "SSH Public key to allow service updates as part of delivery process, leave empty to disable.", "fr": "Clef publique SSH permettant la mise à jour des services via une deploiement automatique, inactif si non renseigné." @@ -53,11 +53,7 @@ { "name": "is_public", "type": "boolean", - "default": true, - "ask": { - "en": "These services are called by the Dont-code applications, so they should stay public", - "fr": "Merci de laisser ces services public afin de pouvoir être appelé par les applications Dont-code" - } + "default": true } ] } diff --git a/scripts/restore b/scripts/restore index b1928f8..5287907 100755 --- a/scripts/restore +++ b/scripts/restore @@ -119,7 +119,7 @@ ynh_install_mongo --mongo_version=$mongo_version #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 1104de4..2697d80 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -154,7 +154,7 @@ ynh_add_nginx_config # The document path has changed => Copy all the files if [ "$document_path" != "/usr/share/nginx/html/$app/docs" ]; then - ynh_script_progression --message="Moving the document path to its new dir" --time --weight=1 + ynh_script_progression --message="Moving the document path to its new dir" --weight=8 old_doc_path=$document_path document_path=/usr/share/nginx/html/$app/docs