From d4ca899dcbab2ee3400bfe159ea387fd430a13a9 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 15 Aug 2022 19:09:51 +0200 Subject: [PATCH 1/7] Inconsistent service naming between 'ynh_systemd_action' and 'yunohost service add' ... --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d898bc8..033b7e5 100755 --- a/scripts/install +++ b/scripts/install @@ -77,7 +77,7 @@ ynh_add_config --template="../conf/squid.conf" --destination="/etc/$squid/squid. #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Squid3 a web proxy service" --log="/var/log/$squid/access.log" --needs_exposed_ports $squid_port +yunohost service add $squid --description "Squid3 a web proxy service" --log="/var/log/$squid/access.log" --needs_exposed_ports $squid_port #================================================= # START SYSTEMD SERVICE From 129ec828ef99c154c653025a691de33c63c2e247 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 15 Aug 2022 17:09:53 +0000 Subject: [PATCH 2/7] Auto-update README --- README.md | 15 +++++++-------- README_fr.md | 23 +++++++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 0423923..ab10245 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # squid3 for YunoHost -[![Integration level](https://dash.yunohost.org/integration/squid3.svg)](https://dash.yunohost.org/appci/app/squid3) ![](https://ci-apps.yunohost.org/ci/badges/squid3.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/squid3.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/squid3.svg)](https://dash.yunohost.org/appci/app/squid3) ![Working status](https://ci-apps.yunohost.org/ci/badges/squid3.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/squid3.maintain.svg) [![Install squid3 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=squid3) *[Lire ce readme en français.](./README_fr.md)* @@ -22,8 +22,6 @@ Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It r **Shipped version:** 1.0~ynh3 - - ## Disclaimers / important information ## Instruction @@ -49,19 +47,20 @@ Thanks to **Fred** to write the instruction to configure Squid for YunoHost. Fre ## Documentation and resources -* Official app website: http://www.squid-cache.org -* YunoHost documentation for this app: https://yunohost.org/app_squid3 -* Report a bug: https://github.com/YunoHost-Apps/squid3_ynh/issues +* Official app website: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/squid3_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/squid3_ynh/tree/testing --debug or sudo yunohost app upgrade squid3 -u https://github.com/YunoHost-Apps/squid3_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index fb77d5b..3d0de12 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # squid3 pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/squid3.svg)](https://dash.yunohost.org/appci/app/squid3) ![](https://ci-apps.yunohost.org/ci/badges/squid3.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/squid3.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/squid3.svg)](https://dash.yunohost.org/appci/app/squid3) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/squid3.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/squid3.maintain.svg) [![Installer squid3 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=squid3) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer squid3 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.* @@ -16,9 +20,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It reduces bandwidth and improves response times by caching and reusing frequently-requested web pages. Squid has extensive access controls and makes a great server accelerator. -**Version incluse :** 1.0~ynh3 - - +**Version incluse :** 1.0~ynh3 ## Avertissements / informations importantes @@ -45,19 +47,20 @@ Thanks to **Fred** to write the instruction to configure Squid for YunoHost. Fre ## Documentations et ressources -* Site officiel de l'app : http://www.squid-cache.org -* Documentation YunoHost pour cette app : https://yunohost.org/app_squid3 -* Signaler un bug : https://github.com/YunoHost-Apps/squid3_ynh/issues +* Site 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/squid3_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/squid3_ynh/tree/testing --debug ou sudo yunohost app upgrade squid3 -u https://github.com/YunoHost-Apps/squid3_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 7659922c45b659b69119222bc56fa45c463d8c07 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 15 Aug 2022 19:16:33 +0200 Subject: [PATCH 3/7] Inconsistent service naming between 'ynh_systemd_action' and 'yunohost service add' --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 780a711..8f7b654 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -89,7 +89,7 @@ ynh_add_config --template="../conf/squid.conf" --destination="/etc/$squid/squid. #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Squid3 a web proxy service" --log="/var/log/$squid/access.log" --needs_exposed_ports $squid_port +yunohost service add $squid --description "Squid3 a web proxy service" --log="/var/log/$squid/access.log" --needs_exposed_ports $squid_port #================================================= # START SYSTEMD SERVICE From 4baba9b43ed635e65bb6fce50753b34c784195cb Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 15 Aug 2022 19:16:51 +0200 Subject: [PATCH 4/7] Inconsistent service naming between 'ynh_systemd_action' and 'yunohost service add' --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index f4b1c34..9b78599 100755 --- a/scripts/restore +++ b/scripts/restore @@ -78,7 +78,7 @@ ynh_add_config --template="../conf/squid.conf" --destination="/etc/$squid/squid. #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Squid3 a web proxy service" --log="/var/log/$squid/access.log" --needs_exposed_ports $squid_port +yunohost service add $squid --description "Squid3 a web proxy service" --log="/var/log/$squid/access.log" --needs_exposed_ports $squid_port #================================================= # START SYSTEMD SERVICE From a5d1d83e0ffb2ccdb181f7db5a7fd7cfa493cdb2 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 15 Aug 2022 19:17:17 +0200 Subject: [PATCH 5/7] Inconsistent service naming between 'ynh_systemd_action' and 'yunohost service add' --- scripts/remove | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/remove b/scripts/remove index a38a978..5ac91f9 100755 --- a/scripts/remove +++ b/scripts/remove @@ -26,10 +26,10 @@ squid=$(ynh_app_setting_get --app=$app --key=squid_folder) #================================================= # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status $app >/dev/null +if ynh_exec_warn_less yunohost service status $squid >/dev/null then ynh_script_progression --message="Removing $app service integration..." - yunohost service remove $app + yunohost service remove $squid fi #================================================= From 720f8999d880b26dbfc9a56108280dfd8f7c4b2b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 20:42:17 +0200 Subject: [PATCH 6/7] upgrade to bullseye --- check_process | 2 +- manifest.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 2d18291..261f176 100644 --- a/check_process +++ b/check_process @@ -1,6 +1,6 @@ ;; Test complet ; Manifest - port="8095" (PORT) + port="8095" ; Checks pkg_linter=1 setup_sub_dir=0 diff --git a/manifest.json b/manifest.json index 048ddd3..76100e8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Caching proxy for the Web supporting HTTP, HTTPS, FTP and more.", "fr": "Proxy cache pour le web, compatible HTTP, HTTPS, FTP et plus encore." }, - "version": "1.0~ynh3", + "version": "4.13~ynh1", "url": "http://www.squid-cache.org/", "upstream": { "license": "GPL-2.0-only", @@ -18,7 +18,7 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [], From 06a0f3d836c8507c524e0d6f3a4b28329b0c267b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 15 Aug 2022 18:42:23 +0000 Subject: [PATCH 7/7] 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 ab10245..13b6569 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It reduces bandwidth and improves response times by caching and reusing frequently-requested web pages. Squid has extensive access controls and makes a great server accelerator. -**Shipped version:** 1.0~ynh3 +**Shipped version:** 4.13~ynh1 ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 3d0de12..7980dc7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It reduces bandwidth and improves response times by caching and reusing frequently-requested web pages. Squid has extensive access controls and makes a great server accelerator. -**Version incluse :** 1.0~ynh3 +**Version incluse :** 4.13~ynh1 ## Avertissements / informations importantes