Compare commits

..

No commits in common. "1fbc28622cadcff85720bb298e67b519694fd4f1" and "782a85d51572db769703bf909f2ca839c3a3bcf0" have entirely different histories.

4 changed files with 2 additions and 30 deletions

View File

@ -5,12 +5,6 @@ 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

View File

@ -108,30 +108,10 @@ 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():
@ -183,6 +163,5 @@ if __name__ == '__main__':
boottoolsSoftwareCompile()
boottoolsPythonModules()
boottoolsRemovePackages()
configure_stunnel()
setup_resolvconf() ## do this again, since someone seems to be overwriting the file
boottoolsInitrdGenerate (args.osrelease)

View File

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

View File

@ -131,8 +131,7 @@ 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