rdp added systemd unit
This commit is contained in:
@@ -18,58 +18,44 @@ lib.mkIf cfg {
|
|||||||
"d /var/lib/gnome-remote-desktop 0700 gnome-remote-desktop gnome-remote-desktop -"
|
"d /var/lib/gnome-remote-desktop 0700 gnome-remote-desktop gnome-remote-desktop -"
|
||||||
];
|
];
|
||||||
|
|
||||||
# 🔹 Single unified setup service
|
systemd.services.grd-cert = {
|
||||||
systemd.services.gnome-remote-desktop-setup = {
|
description = "GRD TLS cert";
|
||||||
description = "GNOME Remote Desktop (TLS + RDP config)";
|
|
||||||
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
# Run AFTER daemon is up, but don't fail if it isn't
|
serviceConfig.Type = "oneshot";
|
||||||
after = [ "gnome-remote-desktop.service" ];
|
|
||||||
wants = [ "gnome-remote-desktop.service" ];
|
|
||||||
|
|
||||||
serviceConfig = {
|
script = ''
|
||||||
Type = "oneshot";
|
CERT_DIR=/var/lib/gnome-remote-desktop
|
||||||
RemainAfterExit = true;
|
|
||||||
};
|
if [ ! -f "$CERT_DIR/rdp-tls.key" ]; then
|
||||||
|
${pkgs.util-linux}/bin/runuser -u gnome-remote-desktop -- \
|
||||||
|
${pkgs.freerdp}/bin/winpr-makecert -silent -rdp \
|
||||||
|
-path "$CERT_DIR" rdp-tls
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.user.services.grd-setup = {
|
||||||
|
description = "GNOME Remote Desktop setup";
|
||||||
|
|
||||||
|
wantedBy = [ "default.target" ];
|
||||||
|
after = [ "graphical-session.target" ];
|
||||||
|
|
||||||
|
serviceConfig.Type = "oneshot";
|
||||||
|
|
||||||
script = ''
|
script = ''
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
CERT_DIR=/var/lib/gnome-remote-desktop
|
CERT_DIR=/var/lib/gnome-remote-desktop
|
||||||
KEY_FILE=$CERT_DIR/rdp-tls.key
|
|
||||||
CRT_FILE=$CERT_DIR/rdp-tls.crt
|
|
||||||
|
|
||||||
echo "[GRD] Ensuring TLS cert exists..."
|
${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-key "$CERT_DIR/rdp-tls.key"
|
||||||
|
${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-cert "$CERT_DIR/rdp-tls.crt"
|
||||||
if [ ! -f "$KEY_FILE" ]; then
|
|
||||||
${pkgs.util-linux}/bin/runuser -u gnome-remote-desktop -- \
|
|
||||||
${pkgs.freerdp}/bin/winpr-makecert -silent -rdp \
|
|
||||||
-path "$CERT_DIR" rdp-tls
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "[GRD] Waiting for daemon..."
|
|
||||||
|
|
||||||
# Wait for GRD to be responsive (prevents race condition)
|
|
||||||
for i in $(seq 1 10); do
|
|
||||||
if ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show >/dev/null 2>&1; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "[GRD] Applying configuration..."
|
|
||||||
|
|
||||||
${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-key "$KEY_FILE"
|
|
||||||
${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-tls-cert "$CRT_FILE"
|
|
||||||
${pkgs.gnome-remote-desktop}/bin/grdctl rdp enable
|
${pkgs.gnome-remote-desktop}/bin/grdctl rdp enable
|
||||||
|
|
||||||
# Idempotent credential setup
|
|
||||||
if ! ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show | grep -q username; then
|
if ! ${pkgs.gnome-remote-desktop}/bin/grdctl rdp show | grep -q username; then
|
||||||
${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-credentials "free" "a"
|
${pkgs.gnome-remote-desktop}/bin/grdctl rdp set-credentials "free" "a"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "[GRD] Setup complete"
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user