From 7abe57c55f1163d0c7840a18900ee3abd3711c60 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 21 Sep 2021 23:27:14 +0200 Subject: [PATCH 1/6] Cleaning up --- manifest.json | 14 ++++++-------- scripts/install | 2 +- scripts/restore | 2 -- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/manifest.json b/manifest.json index 7e8f20a..b60d0a7 100644 --- a/manifest.json +++ b/manifest.json @@ -3,9 +3,9 @@ "id": "flarum", "packaging_format": 1, "description": { - "en": "Next-generation forum made simple.", - "fr": "Un forum de nouvelle génération, simplement.", - "de": "Forum der nächsten Generation leicht gemacht." + "en": "Next-generation forum made simple", + "fr": "Forum de nouvelle génération, simplement", + "de": "Forum der nächsten Generation leicht gemacht" }, "version": "1.0.0~ynh5", "url": "http://flarum.org/", @@ -27,7 +27,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.3-fpm", "mysql" ], "arguments": { @@ -42,8 +42,7 @@ }, { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", @@ -53,8 +52,7 @@ }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "password", diff --git a/scripts/install b/scripts/install index 7eb09f4..f7192ec 100644 --- a/scripts/install +++ b/scripts/install @@ -65,7 +65,7 @@ ynh_app_setting_set --app=$app --key=ldap_version --value=$ldap_version #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=2 +ynh_script_progression --message="Installing dependencies..." --weight=2 ynh_install_app_dependencies $pkg_dependencies diff --git a/scripts/restore b/scripts/restore index 1a25a68..74aa201 100644 --- a/scripts/restore +++ b/scripts/restore @@ -40,8 +40,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." -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 " From 8db29caa7476a50c2377d228b8d98aecfa85f0e1 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 21 Sep 2021 21:27:20 +0000 Subject: [PATCH 2/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1cf636b..270e3ad 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Next-generation forum made simple. +Next-generation forum made simple **Shipped version:** 1.0.0~ynh5 diff --git a/README_fr.md b/README_fr.md index 7b59d4a..608ebcc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Un forum de nouvelle génération, simplement. +Forum de nouvelle génération, simplement **Version incluse :** 1.0.0~ynh5 From d7eced92f97af3bb77b575d47e296958a5ed08d2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Sep 2021 08:14:31 +0200 Subject: [PATCH 3/6] Add descriptions Add description with full stops! --- doc/DESCRIPTION.md | 1 + doc/DESCRIPTION_fr.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..cba80c6 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community. \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..23735d0 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté. \ No newline at end of file From 63f3419a62ef051526badff416fbc8c0ffd01028 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 22 Sep 2021 06:14:47 +0000 Subject: [PATCH 4/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 270e3ad..cb01787 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Next-generation forum made simple +Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community. **Shipped version:** 1.0.0~ynh5 diff --git a/README_fr.md b/README_fr.md index 608ebcc..861efad 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Forum de nouvelle génération, simplement +Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté. **Version incluse :** 1.0.0~ynh5 From f5cc396f67483da9ec335118317b99a118129b88 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 5 Oct 2021 00:12:36 +0200 Subject: [PATCH 5/6] Bump package version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index b60d0a7..73cdc5c 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Forum de nouvelle génération, simplement", "de": "Forum der nächsten Generation leicht gemacht" }, - "version": "1.0.0~ynh5", + "version": "1.0.0~ynh6", "url": "http://flarum.org/", "upstream": { "license": "MIT", From 7c71ddd298eb4c01658d25deae332321d1138f84 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 4 Oct 2021 22:12:38 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb01787..f816011 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community. -**Shipped version:** 1.0.0~ynh5 +**Shipped version:** 1.0.0~ynh6 **Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum diff --git a/README_fr.md b/README_fr.md index 861efad..763ce5f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté. -**Version incluse :** 1.0.0~ynh5 +**Version incluse :** 1.0.0~ynh6 **Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum