diff --git a/README.md b/README.md index 6d3bad3..9ae67e2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,12 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to Meilisearch is an opensource next generation search API. +<<<<<<< Updated upstream **Shipped version:** 0.10.1 +======= + +**Shipped version:** 0.15.0 +>>>>>>> Stashed changes ## Screenshots @@ -44,10 +49,13 @@ It's an API and there is no authentification, without API key. --- -Developers info ----------------- +## Developers info +<<<<<<< Updated upstream Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/meilisearch_ynh/tree/testing). +======= +Please do your pull request to the [testing branch](https://github.com/frju365/meilisearch_ynh/tree/testing). +>>>>>>> Stashed changes To try the testing branch, please proceed like that. ``` diff --git a/manifest.json b/manifest.json index 9346c56..fd28617 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.10.1~ynh1", + "version": "0.15.0~ynh1", "url": "https://www.meilisearch.com/", "license": "GPL-3.0", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index d2d57c9..329de0c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,6 +1,6 @@ #!/bin/bash -latest="v0.10.1" +latest="v0.15.0" ynh_detect_arch() { local architecture diff --git a/scripts/backup b/scripts/backup index e469b29..dc52367 100644 --- a/scripts/backup +++ b/scripts/backup @@ -32,33 +32,25 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP #================================================= -# STOP SYSTEMD SERVICE -#================================================= - -ynh_script_progression --message="Stopping a systemd service..." --time --weight=1 - -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_print_info --message="Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_script_progression --message="Backing up the main app directory..." --time --weight=1 ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Backing up nginx web server configuration..." --time --weight=1 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Backing up fail2ban configuration..." --time --weight=1 ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" @@ -68,24 +60,15 @@ ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" #================================================= # BACKUP LOGROTATE #================================================= -ynh_script_progression --message="Backing up logrotate configuration..." --time --weight=1 ynh_backup --src_path="/etc/logrotate.d/$app" #================================================= # BACKUP SYSTEMD #================================================= -ynh_script_progression --message="Backing up systemd configuration..." --time --weight=1 ynh_backup --src_path="/etc/systemd/system/$app.service" -#================================================= -# START SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 - -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index a2d2a71..8e411eb 100644 --- a/scripts/install +++ b/scripts/install @@ -74,7 +74,6 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= # DOWNLOAD AND INSTALL MEILISEARCH #================================================= - ynh_script_progression --message="Installing meilisearch..." --time --weight=5 arch=$(ynh_detect_arch) @@ -88,7 +87,6 @@ curl -OL https://github.com/meilisearch/MeiliSearch/releases/download/$latest/me chmod +x "$release_file" mv "$release_file" /usr/bin/meilisearch - #================================================= # NGINX CONFIGURATION #=================================================