From de047c45347c3991b0b8091623103352d6393049 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 24 Dec 2020 19:23:07 +0100 Subject: [PATCH 1/5] Upgrade to 0.0.1-2020-12-24~ynh1 --- README.md | 2 +- check_process | 8 ++++---- conf/app.src | 6 +++--- manifest.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1262a46..5ad75bd 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview A search engine for [PeerTube](https://joinpeertube.org/) videos and channels, developed by Framasoft. -**Shipped version:** 0.0.1-2020-10-31 +**Shipped version:** 0.0.1-2020-12-24 ## Important points to read before installing diff --git a/check_process b/check_process index a60206c..c834a96 100644 --- a/check_process +++ b/check_process @@ -15,6 +15,8 @@ setup_private=1 setup_public=1 upgrade=1 + # 0.0.1-2020-10-31~ynh1 + upgrade=1 from_commit=b0541627859d2b702b55f7ac33e7f786e70b3051 backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. @@ -28,7 +30,5 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& - + ; commit=b0541627859d2b702b55f7ac33e7f786e70b3051 + name=0.0.1-2020-10-31~ynh1 diff --git a/conf/app.src b/conf/app.src index 274df88..6170cc0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://framagit.org/framasoft/peertube/search-index/-/archive/217666c70766aa9a81ce6dde9e6c41a43d2da991/search-index-217666c70766aa9a81ce6dde9e6c41a43d2da991.tar.gz -SOURCE_SUM=c6e5e5a66a2d09c69568328f67c03c5cda864bf51da2cb0f6c8878fdb242081f +SOURCE_URL=https://framagit.org/framasoft/peertube/search-index/-/archive/b44e850fa1604cebac19eb822e9d555f673085b0/search-index-b44e850fa1604cebac19eb822e9d555f673085b0.tar.gz +SOURCE_SUM=7a68fd70aeaac05d06fbbb3c8cf7a375e9d2e112235e4af6857630380e114b18 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= +SOURCE_FILENAME=search-index-0.0.1-2020-12-24~ynh1.tar.gz diff --git a/manifest.json b/manifest.json index 8ea86b6..a09eba9 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A search engine for PeerTube videos and channels", "fr": "Un moteur de recherche de vidéos et chaînes PeerTube" }, - "version": "0.0.1-2020-10-31~ynh1", + "version": "0.0.1-2020-12-24~ynh1", "url": "https://search.joinpeertube.org/", "license": "AGPL-3.0-only", "maintainer": { From 0cc0937243b3c528f660026b9e457aee2beea159 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 26 Dec 2020 00:20:20 +0100 Subject: [PATCH 2/5] Please add --quiet to systemctl enable/disable commands --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 0c518e8..cb7cb04 100644 --- a/scripts/restore +++ b/scripts/restore @@ -101,7 +101,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" ynh_script_progression --message="Restoring the systemd configuration..." ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST From 00f0d18eb060c8f665ccd15ba54e9c28440fa4f9 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 26 Dec 2020 00:21:06 +0100 Subject: [PATCH 3/5] You probably don't need to call 'ynh_normalize_url_path'... --- scripts/upgrade | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0e8eb15..63a921a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -63,13 +63,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= From a16c8d0f4c4bc1c6afac58bec8382c07dbeb3cc0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 26 Dec 2020 00:22:51 +0100 Subject: [PATCH 4/5] Please add --quiet to systemctl enable/disable commands --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 1c46bee..7f73858 100644 --- a/scripts/install +++ b/scripts/install @@ -74,7 +74,7 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies ynh_install_extra_app_dependencies --repo="deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" --package="$extra_pkg_dependencies" --key="https://artifacts.elastic.co/GPG-KEY-elasticsearch" -systemctl enable elasticsearch.service +systemctl enable elasticsearch.service --quiet systemctl start elasticsearch.service ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" diff --git a/scripts/restore b/scripts/restore index cb7cb04..40f754e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -83,7 +83,7 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies ynh_install_extra_app_dependencies --repo="deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" --package="$extra_pkg_dependencies" --key="https://artifacts.elastic.co/GPG-KEY-elasticsearch" -systemctl enable elasticsearch.service +systemctl enable elasticsearch.service --quiet systemctl start elasticsearch.service ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" diff --git a/scripts/upgrade b/scripts/upgrade index 63a921a..f153625 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -103,7 +103,7 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies ynh_install_extra_app_dependencies --repo="deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" --package="$extra_pkg_dependencies" --key="https://artifacts.elastic.co/GPG-KEY-elasticsearch" -systemctl enable elasticsearch.service +systemctl enable elasticsearch.service --quiet systemctl start elasticsearch.service ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" From 7c53ca6dcef0583c97b55759778d3b9a444f6e88 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 26 Dec 2020 00:23:44 +0100 Subject: [PATCH 5/5] Using option '--log_type systemd' with 'yunohost service add' is not relevant anymore --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 7f73858..c9bf422 100644 --- a/scripts/install +++ b/scripts/install @@ -170,7 +170,7 @@ ynh_use_logrotate #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app search index daemon" --log_type systemd +yunohost service add $app --description "$app search index daemon" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 40f754e..deb7278 100644 --- a/scripts/restore +++ b/scripts/restore @@ -108,7 +108,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app search index daemon" --log_type systemd +yunohost service add $app --description "$app search index daemon" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index f153625..48723ca 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app search index daemon" --log_type systemd +yunohost service add $app --description "$app search index daemon" #================================================= # START SYSTEMD SERVICE