From 4d8cab524ae98ed545ccd653f63e6234fc359486 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 16 Feb 2021 23:10:32 +0100 Subject: [PATCH 1/6] Upgrade pip --- scripts/install | 1 + sources/extra_files/app/requirements-ynh.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index b871370..323576c 100644 --- a/scripts/install +++ b/scripts/install @@ -93,6 +93,7 @@ ynh_script_progression --message="Installing Searx..." --weight=2 python3 -m venv --system-site-packages "$final_path" set +u; source $final_path/bin/activate; set -u +pip3 install -U pip pip3 install -U setuptools pip3 install --requirement $final_path/requirements-ynh.txt diff --git a/sources/extra_files/app/requirements-ynh.txt b/sources/extra_files/app/requirements-ynh.txt index a501627..5c59707 100644 --- a/sources/extra_files/app/requirements-ynh.txt +++ b/sources/extra_files/app/requirements-ynh.txt @@ -9,8 +9,8 @@ lxml==4.6.2 pygments==2.1.3 pyopenssl==19.1.0 python-dateutil==2.8.1 -pyyaml==5.3.1 -requests[socks]==2.25.0 +pyyaml==5.4.1 +requests[socks]==2.25.1 # Additionnals requirements markupsafe>=0.23 From eb2f636c25fea19bce64637463dcc79afbf0bc79 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 16 Feb 2021 23:23:56 +0100 Subject: [PATCH 2/6] Update requirements-ynh.txt --- sources/extra_files/app/requirements-ynh.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/extra_files/app/requirements-ynh.txt b/sources/extra_files/app/requirements-ynh.txt index 5c59707..cb0c161 100644 --- a/sources/extra_files/app/requirements-ynh.txt +++ b/sources/extra_files/app/requirements-ynh.txt @@ -11,6 +11,7 @@ pyopenssl==19.1.0 python-dateutil==2.8.1 pyyaml==5.4.1 requests[socks]==2.25.1 +cryptography==3.1.1 # Additionnals requirements markupsafe>=0.23 From 2644509b969d8a842d8458b39b8af6280812d1c0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 16 Feb 2021 23:38:26 +0100 Subject: [PATCH 3/6] Small fixes --- manifest.json | 2 +- scripts/install | 8 ++++---- scripts/upgrade | 7 +++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 23d1d2d..2c4c9cd 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Méta-moteur de recherche respectueux de la vie privée et bidouillable", "de": "Meta-Suchmaschine, die den Privatsphäre wahrt und 'hackable' ist." }, - "version": "0.18.0~ynh2", + "version": "0.18.0~ynh3", "url": "https://searx.github.io/searx/", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index 323576c..35afa76 100644 --- a/scripts/install +++ b/scripts/install @@ -54,7 +54,7 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=35 +ynh_script_progression --message="Installing dependencies..." --weight=2 ynh_install_app_dependencies $pkg_dependencies @@ -117,7 +117,7 @@ ynh_store_file_checksum --file="$final_path/searx/settings.yml" # SET PERMISSIONS ON SEARX DIRECTORY #================================================= -chown -R $app: "$final_path" +chown -R $app: $final_path #================================================= # CONFIGURE UWSGI FOR SEARX @@ -139,12 +139,12 @@ ynh_systemd_action --service_name=uwsgi-app@$app.service --action=start --line_m #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=2 +ynh_script_progression --message="Configuring permissions..." --weight=2 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0caaa3c..c35e989 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,6 +47,13 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= From 8977058487eaaf7ed20f0d42b7cec94963e3e172 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 16 Feb 2021 23:47:14 +0100 Subject: [PATCH 4/6] Update pull_request_template.md --- pull_request_template.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index c2a7d44..0a198cf 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,14 +11,6 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -*Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/searx_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/searx_ynh%20PR-NUM-/) -*Please replace '-NUM-' in this link by the PR number.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* From c7ffae45304d4be507cd4f470650d6886a0fb77f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 17 Feb 2021 19:01:04 +0100 Subject: [PATCH 5/6] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 35afa76..1cbb1cb 100644 --- a/scripts/install +++ b/scripts/install @@ -93,7 +93,7 @@ ynh_script_progression --message="Installing Searx..." --weight=2 python3 -m venv --system-site-packages "$final_path" set +u; source $final_path/bin/activate; set -u -pip3 install -U pip +#pip3 install -U pip pip3 install -U setuptools pip3 install --requirement $final_path/requirements-ynh.txt From 88bf6730e142564df6e2f7cee508fdb85efdaa0c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 17 Feb 2021 22:49:07 +0100 Subject: [PATCH 6/6] Update install --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index 1cbb1cb..513cc18 100644 --- a/scripts/install +++ b/scripts/install @@ -93,7 +93,6 @@ ynh_script_progression --message="Installing Searx..." --weight=2 python3 -m venv --system-site-packages "$final_path" set +u; source $final_path/bin/activate; set -u -#pip3 install -U pip pip3 install -U setuptools pip3 install --requirement $final_path/requirements-ynh.txt