From 47c2cec5c6c31c1a5139f1445fb6cce99bde9e70 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 9 Nov 2020 19:33:50 +0300 Subject: [PATCH] ROSA: generate keys and certificates before service start up We do not want to generate them in package scriptlets to avoid shipping them in ISO images with xrdp preinstalled. --- instfiles/xrdp.service.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instfiles/xrdp.service.in b/instfiles/xrdp.service.in index 576c1c25..bca18630 100644 --- a/instfiles/xrdp.service.in +++ b/instfiles/xrdp.service.in @@ -8,7 +8,11 @@ After=network.target xrdp-sesman.service Type=forking PIDFile=@localstatedir@/run/xrdp.pid EnvironmentFile=-@sysconfdir@/sysconfig/xrdp -EnvironmentFile=-@sysconfdir@/default/xrdp +#EnvironmentFile=-@sysconfdir@/default/xrdp +# (re)generate certificates +ExecStartPre=/usr/bin/cert-sh generate xrdp +# generate keys +ExecStartPre=/bin/sh -e -c 'if [ ! -f /etc/xrdp/rsakeys.ini ]; then xrdp-keygen xrdp /etc/xrdp/rsakeys.ini; chmod 0600 /etc/xrdp/rsakeys.ini; fi' ExecStart=@sbindir@/xrdp $XRDP_OPTIONS ExecStop=@sbindir@/xrdp $XRDP_OPTIONS --kill -- 2.25.1