This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch mini in repository live-build-x2go. commit bd72a61c9ec32036c2aa790928a3c857546a15fb Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Aug 5 21:14:20 2016 +0200 added x11vnc startup, commented out, with a note how stupid it is --- .../lib/live/config/2800-x2go-thinclientconfig | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 6efdc18..01950a9 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -38,6 +38,29 @@ LDAP2=\$(cat /proc/cmdline | \ sed 's/^ldap2=/ldap2#/' | \ awk -F'#' ' /^ldap2#/ { print \$2 }') +# Spawn x11vnc +# x11vnc -wait 50 -passwd PASSWORD -forever -loop -display :0 -o /var/log/x11vnc.log & +# +# This runs as user, so cannot write to /var/log - thus you should use this instead: +# x11vnc -wait 50 -passwd PASSWORD -forever -loop -display :0 & +# +# Spawning x11vnc here is a really, really dumb idea, as VNC has no way of using +# a public/private key pair, only passwords - and these must be stored in plain +# text somewhere, in a place that is actually world-readable. +# +# /!\ This is about as dumb as shouting your root password in a room full of strangers! /!\ +# +# A much, much better, safer and saner way to handle this is to enable the +# SSH daemon on the thinclient, supply it with an authorized_keys file containing +# a public key, and spawning x11vnc on demand after logging in - binding it to +# localhost only, and forwarding the port through your SSH connection. +# +# In short, run this on your local admin workstation: +# ssh -t -L 5900:localhost:5900 name_or_ip_of_thinclient 'x11vnc -localhost -display :0' +# and while this connection is active, run: +# vncviewer localhost:0 + + # Spawn X2GoClient if [ -n "\$BROKERURL" ]; then SESSIONFROM="--broker-url=\$BROKERURL" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch mini in repository live-build-x2go. commit c84f42ee6cb2e9cf6b284c4a7ea33ac024b8ae8b Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Aug 5 21:16:35 2016 +0200 this script downloads an ssh public key file for root --- .../includes.chroot/lib/live/config/2150-setsshkey | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2150-setsshkey b/config/includes.chroot/lib/live/config/2150-setsshkey new file mode 100755 index 0000000..01dbaa2 --- /dev/null +++ b/config/includes.chroot/lib/live/config/2150-setsshkey @@ -0,0 +1,43 @@ +#!/bin/sh + +SetSSHKey () +{ + +# Output startup message +# +echo -n " setsshkey" + + +PUBKEYURL=\$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^pubkey=/ { print \$2 }') + +if [ -n "$PUBKEYURL" ] ; then + +# Set Keyfile +# +mkdir -p /root/.ssh +chmod 600 /root/.ssh +touch /root/.ssh/authorized_keys +chmod 600 /root/.ssh/authorized_keys + +if echo "$PUBKEY" | grep -q "^tftp://" ; then + PUBKEYSERVER=$(echo "$PUBKEYURL" | sed 's#^tftp://\([^/]*\)/.*$#\1#' ) + PUBKEYPATH=$(echo "$PUBKEYURL" | sed 's#^tftp://[^/]*/\(.*\)$#\1#' ) + if [ -n "$PUBKEYSERVER" ] && [ -n "$PUBKEYPATH" ] ; then + while ! atftp $PUBKEYSERVER -g -r $PUBKEYPATH -l /root/.ssh/authorized_keys ; do + echo "Waiting for SSH Public Key ..." + sleep 5 + done + fi +else + while ! wget -q -O - $PUBKEYURL >/root/.ssh/authorized_keys ; do + echo "Waiting for SSH Public Key ..." + sleep 5 + done +fi + +} + +SetSSHKey + -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git