Update base image to Ubuntu 24.04

This commit is contained in:
Héctor Molinero Fernández
2024-05-28 19:36:22 +02:00
parent e732499b5b
commit 649bc33cb7
12 changed files with 239 additions and 151 deletions

View File

@@ -104,14 +104,24 @@ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
ssh-keygen -t rsa -b 4096 -f /etc/ssh/ssh_host_rsa_key -N '' >/dev/null
fi
# Generate xrdp RSA keys if they do not exist
if [ ! -f "${XRDP_RSAKEYS_PATH:?}" ]; then
mkdir -p "$(dirname "${XRDP_RSAKEYS_PATH:?}")"
(umask 077 \
&& xrdp-keygen xrdp "${XRDP_RSAKEYS_PATH:?}" \
) >/dev/null
fi
# Generate RDP certificate if it does not exist
if [ ! -f "${XRDP_TLS_KEY_PATH:?}" ] || [ ! -f "${XRDP_TLS_CRT_PATH:?}" ]; then
FQDN=$(hostname --fqdn)
mkdir -p "$(dirname "${XRDP_TLS_KEY_PATH:?}")"
(umask 077 \
&& openssl ecparam -genkey -name prime256v1 > "${XRDP_TLS_KEY_PATH:?}" \
) >/dev/null
mkdir -p "$(dirname "${XRDP_TLS_CRT_PATH:?}")"
(umask 022 \
&& openssl req -x509 -sha256 -days 3650 -subj "/CN=${FQDN:?}" -addext "subjectAltName=DNS:${FQDN:?}" -key "${XRDP_TLS_KEY_PATH:?}" > "${XRDP_TLS_CRT_PATH:?}" \
) >/dev/null

View File

@@ -3,4 +3,4 @@
set -eu
exec 2>&1
exec xrdp-sesman --nodaemon
exec xrdp-sesman --config /opt/xrdp/etc/xrdp/sesman.ini --nodaemon

View File

@@ -3,4 +3,4 @@
set -eu
exec 2>&1
exec xrdp --nodaemon
exec xrdp --config /opt/xrdp/etc/xrdp/xrdp.ini --nodaemon