From 27aae07732723efb24507bde0f1721048de729f4 Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 13 Jun 2020 08:48:03 +0200 Subject: [PATCH 1/6] update badges --- README.md | 6 +++++- README_fr.md | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 81eab55..785fdcb 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,12 @@ ![blogotext_logo](sources/images/blogotext_logo.png) +[ +![](https://dash.yunohost.org/integration/blogotext.svg) +![](https://ci-apps.yunohost.org/ci/badges/blogotext.status.svg) +![](https://ci-apps.yunohost.org/ci/badges/blogotext.maintain.svg) +](https://dash.yunohost.org/appci/app/blogotext) -[![Integration level](https://dash.yunohost.org/integration/blogotext.svg)](https://dash.yunohost.org/appci/app/blogotext) [![Install BlogoText with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=blogotext) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 8041cf7..077015f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -2,8 +2,12 @@ ![blogotext_logo](sources/images/blogotext_logo.png) +[ +![](https://dash.yunohost.org/integration/blogotext.svg) +![](https://ci-apps.yunohost.org/ci/badges/blogotext.status.svg) +![](https://ci-apps.yunohost.org/ci/badges/blogotext.maintain.svg) +](https://dash.yunohost.org/appci/app/blogotext) -[![Integration level](https://dash.yunohost.org/integration/blogotext.svg)](https://dash.yunohost.org/appci/app/blogotext) [![Install BlogoText with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=blogotext) *[Read this readme in english.](./README.md)* From 50b20860f8953956e991ce9a90ed5aa40fa8c315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 10 Aug 2020 18:05:17 +0200 Subject: [PATCH 2/6] Update manifest.json - Fix description --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 5109f6a..bb4ddff 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "blogotext", "packaging_format": 1, "description": { - "en": "This is BlogoText, the lightweight Blog-Engine.", - "fr": "Ceci est BlogoText, un moteur de blog léger." + "en": "Lightweight Blog-Engine.", + "fr": "Un moteur de blog léger." }, "version": "3.7.6", "url": "https://blogotext.org/", From 224381669f9324ee7a3f07bc642e3a081a7102ef Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Sun, 11 Oct 2020 01:58:48 +0200 Subject: [PATCH 3/6] [fix] Version Number --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index bb4ddff..11365cd 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Lightweight Blog-Engine.", "fr": "Un moteur de blog léger." }, - "version": "3.7.6", + "version": "3.7.6~ynh1", "url": "https://blogotext.org/", "license": "MIT", "maintainer": { From b20b8bc9ad3a3460df68be33cda38baf5a5295f2 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 6 Nov 2020 18:51:21 +0100 Subject: [PATCH 4/6] Do not open a damn port that is not even used anywhere wtf ? --- scripts/install | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scripts/install b/scripts/install index 99f0314..3bfe5e2 100755 --- a/scripts/install +++ b/scripts/install @@ -73,20 +73,6 @@ ynh_app_setting_set $app language $language #================================================= # STANDARD MODIFICATIONS #================================================= -# FIND AND OPEN A PORT -#================================================= -ynh_print_info "Configuring firewall..." - -### Use these lines if you have to open a port for the application -### `ynh_find_port` will find the first available port starting from the given port. -### If you're not using these lines: -### - Remove the section "CLOSE A PORT" in the remove script - -# Find a free port -port=$(ynh_find_port 8095) -# Open this port -ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port -ynh_app_setting_set $app port $port #================================================= # INSTALL DEPENDENCIES From 38a27158ecf51bef6b79af4d629fe05ef4b63583 Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Nov 2020 11:00:51 +0100 Subject: [PATCH 5/6] fix security hole + upgrade from previous version --- check_process | 9 +++++---- manifest.json | 2 +- scripts/install | 13 +++++++++++++ scripts/remove | 11 ++++++++++- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/check_process b/check_process index 40958ed..afc2d18 100644 --- a/check_process +++ b/check_process @@ -20,7 +20,8 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=CommitHash + #3.7.6~ynh1 + upgrade=1 from_commit=e49200ad7f98acba70737dc7db314c51a2a07802 backup_restore=1 multi_instance=1 incorrect_path=1 @@ -43,7 +44,7 @@ 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=e49200ad7f98acba70737dc7db314c51a2a07802 + name=3.7.6~ynh1(11oct2020) + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=password1234&port=666& diff --git a/manifest.json b/manifest.json index 11365cd..214c967 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Lightweight Blog-Engine.", "fr": "Un moteur de blog léger." }, - "version": "3.7.6~ynh1", + "version": "3.7.6~ynh2", "url": "https://blogotext.org/", "license": "MIT", "maintainer": { diff --git a/scripts/install b/scripts/install index 3bfe5e2..c2ea037 100755 --- a/scripts/install +++ b/scripts/install @@ -73,6 +73,19 @@ ynh_app_setting_set $app language $language #================================================= # STANDARD MODIFICATIONS #================================================= +# FIND AND OPEN A PORT +#================================================= +ynh_print_info "Configuring firewall..." + +### Use these lines if you have to open a port for the application +### `ynh_find_port` will find the first available port starting from the given port. +### If you're not using these lines: +### - Remove the section "CLOSE A PORT" in the remove script + +# Find a free port +#port=$(ynh_find_port 8095) +# Open this port +#ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port #================================================= # INSTALL DEPENDENCIES diff --git a/scripts/remove b/scripts/remove index 36ca41c..b119b2a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,7 +17,7 @@ ynh_print_info "Loading installation settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) -port=$(ynh_app_setting_get $app port) +#port=$(ynh_app_setting_get $app port) db_name=$(ynh_app_setting_get $app db_name) db_user=$db_name final_path=$(ynh_app_setting_get $app final_path) @@ -95,6 +95,15 @@ ynh_print_info "Removing logrotate configuration" # CLOSE A PORT #================================================= +#if yunohost firewall list | grep -q "\- $port$" +#then +# ynh_print_info "Closing port $port" +# ynh_exec_warn_less yunohost firewall disallow TCP $port +#fi + +# close port if it was previously opened +# https://github.com/YunoHost-Apps/blogotext_ynh/pull/13 +port=$(ynh_app_setting_get $app port) if yunohost firewall list | grep -q "\- $port$" then ynh_print_info "Closing port $port" From a807e330d4c9ad7f53e8a87a841b5f42edade841 Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Nov 2020 11:04:48 +0100 Subject: [PATCH 6/6] update install script --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index c2ea037..dd98536 100755 --- a/scripts/install +++ b/scripts/install @@ -86,6 +86,7 @@ ynh_print_info "Configuring firewall..." #port=$(ynh_find_port 8095) # Open this port #ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port +#ynh_app_setting_set $app port $port #================================================= # INSTALL DEPENDENCIES