Merge pull request 'stunnel' (#10) from stunnel into main

Reviewed-on: #10

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).
 
+## [3.4.0] - 2025-05-18
+
+### Changed
+
+- Install and configure stunnel in the image
+
 ## [3.3.0] - 2025-05-14
 
 ### Changed

chroot-tasks.py

@@ -108,10 +108,30 @@ def updateCaCertificates():
     print ('Updating CA trust Store', file=sys.stderr)
     utils.run (['update-ca-certificates'])
 
+def configure_stunnel():
+    print ('configure_stunnel', file=sys.stderr)
+    with open ('/etc/stunnel/menu.conf', 'w') as fd:
+        fd.write ('setuid = stunnel4\n')
+        fd.write ('setgid = stunnel4\n')
+        fd.write ('pid = /var/run/stunnel4/menu.pid\n')
+        fd.write ('foreground = yes\n')
+        fd.write ('debug = info\n')
+        fd.write ('\n')
+        fd.write ('[menu]\n')
+        fd.write ('client = yes\n')
+        fd.write ('accept = 127.0.0.1:81\n')
+        fd.write ('connect = __OGCORE_IP__:__OGCORE_PORT__\n')
+        fd.write ('cert = /opt/opengnsys/etc/ogagent.crt\n')
+        fd.write ('key = /opt/opengnsys/etc/ogagent.key\n')
+        fd.write ('CAfile = /opt/opengnsys/etc/ca.crt\n')
+        fd.write ('requireCert = yes\n')
+        fd.write ('verifyChain = yes\n')
+
 def boottoolsPythonModules():
     utils.run (['pip3', 'install', 'pyblkid', '--break-system-packages'])
 
 def boottoolsRemovePackages():
+    print ('boottoolsRemovePackages', file=sys.stderr)
     apt.remove (['python3-dev', 'python3-setuptools', 'python3-pip'])
 
 def setup_resolvconf():
@@ -163,5 +183,6 @@ if __name__ == '__main__':
     boottoolsSoftwareCompile()
     boottoolsPythonModules()
     boottoolsRemovePackages()
+    configure_stunnel()
     setup_resolvconf()    ## do this again, since someone seems to be overwriting the file
     boottoolsInitrdGenerate (args.osrelease)

includes/etc/initramfs-tools/scripts/VERSION.txt

@@ -1 +1 @@
-OpenGnsys Client 3.3.0
+OpenGnsys Client 3.4.0

mkoglive.cfg

@@ -131,7 +131,8 @@ xwindows =
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
 
+ogagent = stunnel4
+
 ogbrowser = sway libinput-tools hwdata ogbrowser
 
 oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid ntfs-3g-system-compression python3-tqdm
-