diff options
-rwxr-xr-x | invoke_session_debian | 24 | ||||
-rwxr-xr-x | setup_session_debian | 13 | ||||
-rwxr-xr-x | stop_hacking_debian | 2 |
3 files changed, 0 insertions, 39 deletions
diff --git a/invoke_session_debian b/invoke_session_debian index 9f05390..439d298 100755 --- a/invoke_session_debian +++ b/invoke_session_debian @@ -44,23 +44,6 @@ fi EOF IRC_AVAILABLE=false -if [ ! -z "${IRC_USER}" ]; then - if apt-get install -qq python-irc; then - IRC_AVAILABLE=true - TMP_IRC_USER=hs-${RANDOM} - # make a unique user - cat <<EOF | python /usr/share/doc/python-irc/examples/irccat2.py ${IRC_SERVER} ${TMP_IRC_USER} ${IRC_USER} -Your hacking session is now ready -Please connect to: -${SSH_COMMAND} -EOF - fi -fi -if [ ! -z "${NOTIFY_URL}" ]; then - if apt-get install -qq wget; then - wget -O - "${NOTIFY_URL}?ssh=${ip_addr}" - fi -fi echo "" mkdir -p /run mkdir -p /run/hacking @@ -89,13 +72,6 @@ do if [ $ELAPSED -gt 691200 ]; then echo "No user logged in. Terminating session..." TERMINATED=true - if ${IRC_AVAILABLE}; then - # make a unique user - cat <<EOF | python /usr/share/doc/python-irc/examples/irccat2.py ${IRC_SERVER} ${TMP_IRC_USER} ${IRC_USER} -Your hacking session was terminated due to inactivity -There was no user logged in for ${ELAPSED} seconds. -EOF - fi lava-test-case hacking-session-terminated --result fail --measurement ${ELAPSED} --units seconds stop_hacking fi diff --git a/setup_session_debian b/setup_session_debian index f96553c..0988b5c 100755 --- a/setup_session_debian +++ b/setup_session_debian @@ -22,19 +22,6 @@ chmod 0600 ~/.ssh/authorized_keys echo "Public Key Installed: $1" lava-test-case public-key-installed --result pass -# Account for running under sudo -if [ ! -z "${SUDO_USER}" ]; then - echo "Fixing up ${HOME}/.ssh permissions to ${SUDO_USER}:${SUDO_GID}" - chown -R ${SUDO_USER}:${SUDO_GID} ${HOME}/.ssh -fi - -grep -P "^LogLevel" /etc/ssh/sshd_config -if [ $? -eq 0 ]; then - sed -i "s/^LogLevel\ [A-Z]\+/LogLevel\ DEBUG/g" /etc/ssh/sshd_config -else - echo "LogLevel DEBUG" >> /etc/ssh/sshd_config -fi - /etc/init.d/ssh restart echo "sshd re-started" if [ $? -eq 0 ]; then diff --git a/stop_hacking_debian b/stop_hacking_debian index 3c97348..8fbf3df 100755 --- a/stop_hacking_debian +++ b/stop_hacking_debian @@ -1,4 +1,2 @@ #!/bin/bash rm /run/hacking/hacking.pid -rm ~/.ssh/authorized_keys -/etc/init.d/ssh stop |