Merge pull request #5 from YunoHost-Apps/testing

Testing
2024-09-03 19:45:59 +02:00 · 2023-01-13 21:36:19 +01:00 · 2023-01-13 21:36:19 +01:00 · 09b4db6b46
commit 09b4db6b46
parent b16e5edbe7 6e95114bca
10 changed files with 59 additions and 106 deletions
--- a/README.md
+++ b/README.md
@ -1,67 +1,48 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Mindmaps for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/mindmaps.svg)](https://dash.yunohost.org/appci/app/mindmaps) ![](https://ci-apps.yunohost.org/ci/badges/mindmaps.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mindmaps.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/mindmaps.svg)](https://dash.yunohost.org/appci/app/mindmaps) ![Working status](https://ci-apps.yunohost.org/ci/badges/mindmaps.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mindmaps.maintain.svg)  
 [![Install Mindmaps with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mindmaps)

 *[Lire ce readme en français.](./README_fr.md)*

-> *This package allows you to install Mindmaps quickly and simply on a YunoHost server.  
+> *This package allows you to install Mindmaps quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*

 ## Overview
+
 Mindmaps is a HTML5 based mind mapping application. It lets you create neat looking mind maps in the browser.

-**Shipped version:** 20201010
+
+**Shipped version:** 0.0.20201010~ynh2
+
+**Demo:** https://www.mindmaps.app/

 ## Screenshots

-![](sources/mindmaps-screenshot.jpg)
+![Screenshot of Mindmaps](./doc/screenshots/mindmaps-screenshot.jpg)

-## Demo
+## Documentation and resources

-* [Official demo](https://www.mindmaps.app/)
-
-## Documentation
-
- * Official documentation: Link to the official documentation of this app
- * YunoHost documentation: https://yunohost.org/en/app_mindmaps
-
-## YunoHost specific features
-
-#### Multi-user support
-
- * Are LDAP and HTTP auth supported? **No**
- * Can the app be used by multiple users? **Yes**
-
-#### Supported architectures
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mindmaps.svg)](https://ci-apps.yunohost.org/ci/apps/mindmaps/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mindmaps.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mindmaps/)
-
-## Limitations
-
-* Any known limitations.
-
-## Additional information
-
-* Other info you would like to add about this app.
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/mindmaps_ynh/issues
- * App website: https://www.mindmaps.app/
- * Upstream app repository: https://github.com/drichard/mindmaps
- * YunoHost website: https://yunohost.org/
-
---
+* Official app website: <https://www.mindmaps.app/>
+* Upstream app code repository: <https://github.com/drichard/mindmaps>
+* YunoHost documentation for this app: <https://yunohost.org/app_mindmaps>
+* Report a bug: <https://github.com/YunoHost-Apps/mindmaps_ynh/issues>

 ## Developer info

 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing).

 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade mindmaps -u https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -1,67 +1,47 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Mindmaps pour YunoHost

-[![Integration level](https://dash.yunohost.org/integration/mindmaps.svg)](https://dash.yunohost.org/appci/app/mindmaps) ![](https://ci-apps.yunohost.org/ci/badges/mindmaps.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mindmaps.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/mindmaps.svg)](https://dash.yunohost.org/appci/app/mindmaps) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mindmaps.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mindmaps.maintain.svg)  
 [![Installer Mindmaps avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mindmaps)

-*[Read this readme in english.](./README.md)* 
+*[Read this readme in english.](./README.md)*

-> *Ce package vous permet d’installer Mindmaps rapidement et simplement sur un serveur YunoHost.  
-Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.*
+> *Ce package vous permet d'installer Mindmaps rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+
+## Vue d'ensemble

-## Vue d’ensemble
 Mindmaps est une application de mind mapping basée sur HTML5. Il vous permet de créer des cartes mentales soignées dans le navigateur.

-**Shipped version:** 20201010
+**Version incluse :** 0.0.20201010~ynh2

-## Captures d’écran
+**Démo :** https://www.mindmaps.app/

-![](sources/mindmaps-screenshot.jpg)
+## Captures d'écran

-## Démo
+![Capture d'écran de Mindmaps](./doc/screenshots/mindmaps-screenshot.jpg)

-* [Démo officielle](https://www.mindmaps.app/)
+## Documentations et ressources

-## Documentation
-
- * Documentation officielle : Lien vers la documentation officielle de cette application.
- * Documentation YunoHost : https://yunohost.org/fr/app_mindmaps
-
-## Caractéristiques spécifiques YunoHost
-
-#### Support multi-utilisateur
-
-* L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
-* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui**
-
-#### Architectures supportées
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mindmaps.svg)](https://ci-apps.yunohost.org/ci/apps/mindmaps/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mindmaps.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mindmaps/)
-
-## Limitations
-
-* Limitations connues.
-
-## Informations additionnelles
-
-* Autres informations que vous souhaitez ajouter sur cette application.
-
-## Liens
-
- * Signaler un bug : https://github.com/YunoHost-Apps/mindmaps_ynh/issues
- * Site de l'application : https://www.mindmaps.app/
- * Dépôt de l'application principale : https://github.com/drichard/mindmaps
- * Site web YunoHost : https://yunohost.org/
-
---
+* Site officiel de l'app : <https://www.mindmaps.app/>
+* Dépôt de code officiel de l'app : <https://github.com/drichard/mindmaps>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_mindmaps>
+* Signaler un bug : <https://github.com/YunoHost-Apps/mindmaps_ynh/issues>

 ## Informations pour les développeurs

 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing).

 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing --debug
-or
+ou
 sudo yunohost app upgrade mindmaps -u https://github.com/YunoHost-Apps/mindmaps_ynh/tree/testing --debug
 ```
+
+**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
--- 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;
-  }
-
  # Include SSOWAT user panel.
  include conf.d/yunohost_panel.conf.inc;
 }
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@ -0,0 +1 @@
+Mindmaps is a HTML5 based mind mapping application. It lets you create neat looking mind maps in the browser.
--- a/doc/DESCRIPTION_fr.md
+++ b/doc/DESCRIPTION_fr.md
@ -0,0 +1 @@
+Mindmaps est une application de mind mapping basée sur HTML5. Il vous permet de créer des cartes mentales soignées dans le navigateur.
--- a/doc/screenshots/mindmaps-screenshot.jpg
+++ b/doc/screenshots/mindmaps-screenshot.jpg
--- a/manifest.json
+++ b/manifest.json
@ -8,14 +8,19 @@
    },
    "version": "0.0.20201010~ynh2",
    "url": "https://www.mindmaps.app/",
+    "upstream": {
+        "license": "AGPL-3.0",
+        "website": "https://www.mindmaps.app/",
+        "demo": "https://www.mindmaps.app/",
+        "code": "https://github.com/drichard/mindmaps"
+    },
    "license": "AGPL-3.0",
    "maintainer": {
        "name": "",
-        "email": "",
-        "url": ""
+        "email": ""
    },
    "requirements": {
-        "yunohost": ">= 4.1.7"
+        "yunohost": ">= 11.0.9"
    },
    "multi_instance": false,
    "services": [
@ -25,8 +30,7 @@
        "install" : [
            {
                "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
            },
            {
                "name": "path",
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -4,9 +4,6 @@
 # COMMON VARIABLES
 #=================================================

-# dependencies used by the app
-pkg_dependencies="deb1 deb2 php$YNH_DEFAULT_PHP_VERSION-deb1 php$YNH_DEFAULT_PHP_VERSION-deb2"
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================
--- a/scripts/install
+++ b/scripts/install
@ -66,7 +66,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1
 # Create a dedicated NGINX config
 ynh_add_nginx_config

-
 #=================================================
 # SETUP SSOWAT
 #=================================================
@ -75,8 +74,6 @@ ynh_script_progression --message="Configuring permissions..." --weight=1
 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
-	# Everyone can access the app.
-	# The "main" permission is automatically created before the install script.
 	ynh_permission_update --permission="main" --add="visitors"
 fi
 #=================================================
--- a/scripts/restore
+++ b/scripts/restore
@ -33,10 +33,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2

-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "

 #=================================================
 # STANDARD RESTORATION STEPS
				`@ -0,0 +1 @@`
				`Mindmaps is a HTML5 based mind mapping application. It lets you create neat looking mind maps in the browser.`
				`@ -0,0 +1 @@`
				`Mindmaps est une application de mind mapping basée sur HTML5. Il vous permet de créer des cartes mentales soignées dans le navigateur.`