From f8156c76ee1de84147c200b4608518ab31946f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Jan 2023 10:11:49 +0100 Subject: [PATCH 1/4] Fix linter --- check_process | 10 ---------- conf/nginx.conf | 6 ------ conf/systemd.service | 2 +- doc/DESCRIPTION.md | 1 + doc/DISCLAIMER.md | 7 +++++++ .../screenshots/movies-web-demo.gif | Bin manifest.json | 7 ++++++- 7 files changed, 15 insertions(+), 18 deletions(-) create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DISCLAIMER.md rename movies-web-demo.gif => doc/screenshots/movies-web-demo.gif (100%) diff --git a/check_process b/check_process index 93378bf..3e034c4 100644 --- a/check_process +++ b/check_process @@ -10,15 +10,6 @@ is_public=1 port="3500" data_path="" - ; Actions - action_argument=arg1|arg2 - is_public=1|0 - ; Config_panel - main.categorie.config_example=arg1|arg2 - main.overwrite_files.overwrite_phpfpm=1|0 - main.php_fpm_config.footprint=low|medium|high|specific - main.php_fpm_config.free_footprint=20 - main.php_fpm_config.usage=low|medium|high ; Checks pkg_linter=1 setup_sub_dir=0 @@ -30,7 +21,6 @@ upgrade=1 from_commit=30d48110ea0c820c89ab8ade34e415f07b5b0b86 backup_restore=1 multi_instance=1 - port_already_use=1 (3500) change_url=1 actions=0 config_panel=0 diff --git a/conf/nginx.conf b/conf/nginx.conf index 7a0a201..bbef711 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,12 +12,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; } diff --git a/conf/systemd.service b/conf/systemd.service index 8af88a7..6696593 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Meilisearch: Lightning Fast Search Engine +Description=Meilisearch: lightning Fast Search Engine After=systemd-user-sessions.service [Service] diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..96481f8 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Meilisearch is an opensource next generation search API. \ No newline at end of file diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..72ecac6 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,7 @@ +## Configuration + +At the installation, be sure to set up an API key to secure your API. + +## Problem and todo + +- Doesn't install on subpath (WIP). \ No newline at end of file diff --git a/movies-web-demo.gif b/doc/screenshots/movies-web-demo.gif similarity index 100% rename from movies-web-demo.gif rename to doc/screenshots/movies-web-demo.gif diff --git a/manifest.json b/manifest.json index 0382b67..cf637c2 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,11 @@ }, "version": "0.22.0~ynh1", "url": "https://www.meilisearch.com/", + "upstream": { + "license": "GPL-3.0", + "website": "https://www.meilisearch.com/", + "code": "https://github.com/meilisearch/MeiliSearch" + }, "license": "GPL-3.0", "maintainer": { "name": "Julien Gomes Dias", @@ -15,7 +20,7 @@ "url": "https://julien.gomes-dias.dev" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ From 150226f738557ad37f8c0a4f85e5d570ab16fca1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 18 Jan 2023 09:11:55 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 52 ++++++++++++++++++++++++---------------------- README_fr.md | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 25 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index 126561a..ef34935 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,29 @@ -# Meilisearch for YunoHost + -[![Integration level](https://dash.yunohost.org/integration/meilisearch.svg)](https://dash.yunohost.org/appci/app/meilisearch) ![](https://ci-apps.yunohost.org/ci/badges/meilisearch.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/meilisearch.maintain.svg) -[![Install Meilisearch with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=meilisearch) +# MeiliSearch for YunoHost + +[![Integration level](https://dash.yunohost.org/integration/meilisearch.svg)](https://dash.yunohost.org/appci/app/meilisearch) ![Working status](https://ci-apps.yunohost.org/ci/badges/meilisearch.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/meilisearch.maintain.svg) +[![Install MeiliSearch with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=meilisearch) *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install Meilisearch quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +> *This package allows you to install MeiliSearch 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 Meilisearch is an opensource next generation search API. -**Shipped version:** 0.20.0 +**Shipped version:** 0.22.0~ynh1 ## Screenshots -![](movies-web-demo.gif) +![Screenshot of MeiliSearch](./doc/screenshots/movies-web-demo.gif) + +## Disclaimers / important information ## Configuration @@ -25,32 +32,27 @@ At the installation, be sure to set up an API key to secure your API. ## Problem and todo - Doesn't install on subpath (WIP). +## :red_circle: Antifeatures -#### Multi-users support +- **Package not maintained**: This YunoHost package is not maintained and needs adoption. -It's an API and there is no authentification, without API key. +## Documentation and resources -#### Supported architectures +* Official app website: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/meilisearch.svg)](https://ci-apps.yunohost.org/ci/apps/meilisearch/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/meilisearch.svg)](https://ci-apps-arm.yunohost.org/ci/apps/meilisearch/) +## Developer info -## Links - - * Report a bug: https://github.com/YunoHost-Apps/meilisearch_ynh/issues - * App website: https://www.meilisearch.com/ - * Upstream app repository: https://github.com/meilisearch/MeiliSearch - * YunoHost website: https://yunohost.org/ - ---- - -## Developers info - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/meilisearch_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/meilisearch_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/meilisearch_ynh/tree/testing --debug or sudo yunohost app upgrade meilisearch -u https://github.com/YunoHost-Apps/meilisearch_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..1106c89 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,58 @@ + + +# MeiliSearch pour YunoHost + +[![Niveau d’intégration](https://dash.yunohost.org/integration/meilisearch.svg)](https://dash.yunohost.org/appci/app/meilisearch) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/meilisearch.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/meilisearch.maintain.svg) +[![Installer MeiliSearch avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=meilisearch) + +*[Read this readme in english.](./README.md)* + +> *Ce package vous permet d’installer MeiliSearch 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 + +Meilisearch is an opensource next generation search API. + +**Version incluse :** 0.22.0~ynh1 + +## Captures d’écran + +![Capture d’écran de MeiliSearch](./doc/screenshots/movies-web-demo.gif) + +## Avertissements / informations importantes + +## Configuration + +At the installation, be sure to set up an API key to secure your API. + +## Problem and todo + +- Doesn't install on subpath (WIP). +## :red_circle: Fonctions indésirables + +- **Package not maintained**: This YunoHost package is not maintained and needs adoption. + +## Documentations et ressources + +* Site officiel de l’app : +* Dépôt de code officiel de l’app : +* Documentation YunoHost pour cette app : +* Signaler un bug : + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/meilisearch_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. + +``` bash +sudo yunohost app install https://github.com/YunoHost-Apps/meilisearch_ynh/tree/testing --debug +ou +sudo yunohost app upgrade meilisearch -u https://github.com/YunoHost-Apps/meilisearch_ynh/tree/testing --debug +``` + +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From fe6313dd41e5ad6a9c5f7669466fbe2a0e455e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Jan 2023 11:35:11 +0100 Subject: [PATCH 3/4] 30.5 --- manifest.json | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index cf637c2..dcef748 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Lightning Fast, Ultra Relevant, and Typo-Tolerant Search Engine", "fr": "Moteur de recherche rapide, ultra-performant et tolérant aux fautes de frappe" }, - "version": "0.22.0~ynh1", + "version": "0.30.5~ynh1", "url": "https://www.meilisearch.com/", "upstream": { "license": "GPL-3.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 181233f..f4cde81 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,6 +1,6 @@ #!/bin/bash -latest="v0.22.0" +latest="v0.30.5" ynh_detect_arch() { local architecture From d58067c30cf37e5cfd2034daa4fd7794c0ac54ef Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 18 Jan 2023 10:35:16 +0000 Subject: [PATCH 4/4] 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 ef34935..91c66f4 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 Meilisearch is an opensource next generation search API. -**Shipped version:** 0.22.0~ynh1 +**Shipped version:** 0.30.5~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 1106c89..beaa28d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Meilisearch is an opensource next generation search API. -**Version incluse :** 0.22.0~ynh1 +**Version incluse :** 0.30.5~ynh1 ## Captures d’écran