From 6c88096eae9ee9ae3425226df82b091c520c03ca Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 16 May 2025 15:42:13 +0200 Subject: [PATCH 1/4] refs #2027 #2028 run stunnel during startup --- ogclient/etc/preinit/otherservices.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ogclient/etc/preinit/otherservices.sh b/ogclient/etc/preinit/otherservices.sh index bc5de62..35d4899 100755 --- a/ogclient/etc/preinit/otherservices.sh +++ b/ogclient/etc/preinit/otherservices.sh @@ -13,6 +13,12 @@ ogIsEfiActive && mount -t efivarfs none /sys/firmware/efi/efivars # Lanzar servicios complementarios del cliente. echo "${MSG_OTHERSERVICES:-.}" +# Iniciar stunnel, si es necesario. +if [ -e /etc/stunnel/menu.conf ]; then + sed -i -e "s/__OGCORE_IP__/$ogcore/; s/__OGCORE_PORT__/8443/" /etc/stunnel/menu.conf + stunnel /etc/stunnel/menu.conf +fi + # Iniciar rsyslog, si es necesario. [ -S /dev/log ] || service rsyslog start From 3d2f06d577ad76fe10eaec110a392165ff625e8f Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Sun, 18 May 2025 11:19:56 +0200 Subject: [PATCH 2/4] refs #2028 send stunnel output to a log --- ogclient/etc/preinit/otherservices.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ogclient/etc/preinit/otherservices.sh b/ogclient/etc/preinit/otherservices.sh index 35d4899..4a74bc1 100755 --- a/ogclient/etc/preinit/otherservices.sh +++ b/ogclient/etc/preinit/otherservices.sh @@ -16,7 +16,8 @@ echo "${MSG_OTHERSERVICES:-.}" # Iniciar stunnel, si es necesario. if [ -e /etc/stunnel/menu.conf ]; then sed -i -e "s/__OGCORE_IP__/$ogcore/; s/__OGCORE_PORT__/8443/" /etc/stunnel/menu.conf - stunnel /etc/stunnel/menu.conf + mkdir -p /var/run/stunnel4; chown stunnel4:stunnel4 /var/run/stunnel4 + stunnel /etc/stunnel/menu.conf &>/var/log/stunnel4/menu.log & fi # Iniciar rsyslog, si es necesario. From 4a94875d7ecf5b58cbad25de86585a5ee36e2abd Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Sun, 18 May 2025 12:26:10 +0200 Subject: [PATCH 3/4] refs #2029 change urlMenu to point to stunnel --- ogclient/etc/init/default.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ogclient/etc/init/default.sh b/ogclient/etc/init/default.sh index 67b5d6e..7771c6f 100755 --- a/ogclient/etc/init/default.sh +++ b/ogclient/etc/init/default.sh @@ -21,9 +21,11 @@ echo "${MSG_LAUNCHCLIENT:-.}" if [ -f "/usr/share/OGAgent/opengnsys/linux/OGAgentService.py" -a "$ogstatus" != "offline" ]; then # Ejecutar servicio cliente. cd /usr/share/OGAgent - export OGAGENTCFG_OGCORE_IP=$ogcore + export OGAGENTCFG_OGCORE_IP=$ogcore export OGAGENTCFG_OGLOG_IP=$oglog - export OGAGENTCFG_URLMENU_IP=$ogcore + export OGAGENTCFG_URLMENU_SCHEME=http + export OGAGENTCFG_URLMENU_IP=127.0.0.1 + export OGAGENTCFG_URLMENU_PORT=81 python3 -m opengnsys.linux.OGAgentService fg #GROUP_CONFIG=/opt/opengnsys/ogClient/cfg/${group/ /_}.json #PYMAJMIN=`python3 --version | cut -d" " -f2 | cut -d. -f1,2` From 867508d5ee9ebebcb7372598b9396613782cb2fd Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Sun, 18 May 2025 12:26:44 +0200 Subject: [PATCH 4/4] refs #2029 update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cb9f34..93dba4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.11.0] - 2025-05-18 + +### Changed + +- Run stunnel and point the browser to it + ## [0.10.0] - 2025-05-14 ### Changed