Index: /trunk/packages/sipb-xen-console-server/debian/changelog =================================================================== --- /trunk/packages/sipb-xen-console-server/debian/changelog (revision 386) +++ /trunk/packages/sipb-xen-console-server/debian/changelog (revision 386) @@ -0,0 +1,5 @@ +sipb-xen-console-server (1) unstable; urgency=low + + * Initial release. + + -- SIPB Xen Project Wed, 2 Apr 2008 00:27:12 -0400 Index: /trunk/packages/sipb-xen-console-server/debian/compat =================================================================== --- /trunk/packages/sipb-xen-console-server/debian/compat (revision 386) +++ /trunk/packages/sipb-xen-console-server/debian/compat (revision 386) @@ -0,0 +1,1 @@ +5 Index: /trunk/packages/sipb-xen-console-server/debian/control =================================================================== --- /trunk/packages/sipb-xen-console-server/debian/control (revision 386) +++ /trunk/packages/sipb-xen-console-server/debian/control (revision 386) @@ -0,0 +1,14 @@ +Source: sipb-xen-console-server +Section: servers +Priority: important +Maintainer: sipb-xen@mit.edu +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev +Standards-Version: 3.7.2 + +Package: sipb-xen-console-server +Architecture: all +Provides: ${diverted-files} +Conflicts: ${diverted-files} +Depends: ${shlibs:Depends}, ${misc:Depends}, conserver-server +Description: SIPB Xen serial console server server + This configures the VMM for the server-side of the console server Index: /trunk/packages/sipb-xen-console-server/debian/control.in =================================================================== --- /trunk/packages/sipb-xen-console-server/debian/control.in (revision 386) +++ /trunk/packages/sipb-xen-console-server/debian/control.in (revision 386) @@ -0,0 +1,14 @@ +Source: sipb-xen-console-server +Section: servers +Priority: important +Maintainer: sipb-xen@mit.edu +Build-Depends: @cdbs@ +Standards-Version: 3.7.2 + +Package: sipb-xen-console-server +Architecture: all +Provides: ${diverted-files} +Conflicts: ${diverted-files} +Depends: ${shlibs:Depends}, ${misc:Depends}, conserver-server +Description: SIPB Xen serial console server server + This configures the VMM for the server-side of the console server Index: /trunk/packages/sipb-xen-console-server/debian/copyright =================================================================== --- /trunk/packages/sipb-xen-console-server/debian/copyright (revision 386) +++ /trunk/packages/sipb-xen-console-server/debian/copyright (revision 386) @@ -0,0 +1,3 @@ +This package was created for internal use of the SIPB Xen Project of +the MIT Student Information Processing Board. Ask sipb-xen@mit.edu if +you have questions about redistribution. Index: /trunk/packages/sipb-xen-console-server/debian/rules =================================================================== --- /trunk/packages/sipb-xen-console-server/debian/rules (revision 386) +++ /trunk/packages/sipb-xen-console-server/debian/rules (revision 386) @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1 +DEB_DIVERT_EXTENSION = .sipb-xen +DEB_DIVERT_FILES_sipb-xen-console += \ + /etc/conserver/conserver.cf + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/replace-files.mk Index: /trunk/packages/sipb-xen-console-server/debian/sipb-xen-console.install =================================================================== --- /trunk/packages/sipb-xen-console-server/debian/sipb-xen-console.install (revision 386) +++ /trunk/packages/sipb-xen-console-server/debian/sipb-xen-console.install (revision 386) @@ -0,0 +1,1 @@ +files/* . Index: /trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf =================================================================== --- /trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf (revision 386) +++ /trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf (revision 386) @@ -0,0 +1,36 @@ +# The character '&' in logfile names are substituted with the console +# name. +# + +config * { + sslrequired yes; +} +default full { + rw *; +} +default * { + master black-mesa; + logfile /var/log/conserver/&.log; + timestamp "1lab"; + include full; + type exec; + exec xm console d_f; + execsubst f=cs; +} + +console s_sipb-xen-dev { + type exec; + exec xm console s_sipb-xen-dev; +} + +#include /etc/conserver/includes.cf + +## +## list of clients we allow +## +access * { + allowed 127.0.0.1; + trusted 18.181.0.134; + limited *; +} + Index: /trunk/packages/sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver =================================================================== --- /trunk/packages/sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver (revision 386) +++ /trunk/packages/sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver (revision 386) @@ -0,0 +1,4 @@ +#!/bin/bash + +ls /etc/conserver/conf.d/ | sed -e 's|^|#include /etc/conserver/conf.d/|' >/etc/conserver/includes.cf +/etc/init.d/conserver-server reload Index: /trunk/packages/sipb-xen-console/debian/changelog =================================================================== --- /trunk/packages/sipb-xen-console/debian/changelog (revision 385) +++ /trunk/packages/sipb-xen-console/debian/changelog (revision 386) @@ -1,2 +1,8 @@ +sipb-xen-console (7) unstable; urgency=low + + * Use conserver instead of ssh to connect to black-mesa + + -- Evan Broder Wed, 2 Apr 2008 00:52:05 -0400 + sipb-xen-console (6.2) unstable; urgency=low Index: /trunk/packages/sipb-xen-console/debian/control =================================================================== --- /trunk/packages/sipb-xen-console/debian/control (revision 385) +++ /trunk/packages/sipb-xen-console/debian/control (revision 386) @@ -10,5 +10,5 @@ Provides: ${diverted-files} Conflicts: ${diverted-files} -Depends: ${shlibs:Depends}, ${misc:Depends}, daemon, debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd, openssh-client, openssh-server, python-fuse, sipb-xen-chrony-config, sipb-xen-database-common +Depends: ${shlibs:Depends}, ${misc:Depends}, conserver-client, daemon, debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd, openssh-server, python-fuse, sipb-xen-chrony-config, sipb-xen-database-common Description: SIPB Xen serial console server This package should be installed on sipb-xen-console Index: /trunk/packages/sipb-xen-console/debian/control.in =================================================================== --- /trunk/packages/sipb-xen-console/debian/control.in (revision 385) +++ /trunk/packages/sipb-xen-console/debian/control.in (revision 386) @@ -10,5 +10,5 @@ Provides: ${diverted-files} Conflicts: ${diverted-files} -Depends: ${shlibs:Depends}, ${misc:Depends}, daemon, debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd, openssh-client, openssh-server, python-fuse, sipb-xen-chrony-config, sipb-xen-database-common +Depends: ${shlibs:Depends}, ${misc:Depends}, conserver-client, daemon, debathena-kerberos-config, fuse-utils, libnss-pgsql1, nscd, openssh-server, python-fuse, sipb-xen-chrony-config, sipb-xen-database-common Description: SIPB Xen serial console server This package should be installed on sipb-xen-console Index: /trunk/packages/sipb-xen-console/debian/rules =================================================================== --- /trunk/packages/sipb-xen-console/debian/rules (revision 385) +++ /trunk/packages/sipb-xen-console/debian/rules (revision 386) @@ -9,5 +9,4 @@ /etc/nsswitch.conf \ /etc/pam.d/ssh \ - /etc/ssh/ssh_config \ /etc/ssh/sshd_config Index: /trunk/packages/sipb-xen-console/files/etc/conserver/conserver.cf.sipb-xen =================================================================== --- /trunk/packages/sipb-xen-console/files/etc/conserver/conserver.cf.sipb-xen (revision 386) +++ /trunk/packages/sipb-xen-console/files/etc/conserver/conserver.cf.sipb-xen (revision 386) @@ -0,0 +1,6 @@ +# default config for console +config * { + master black-mesa; + port 3109; + sslenabled yes; +} Index: /trunk/packages/sipb-xen-console/files/etc/motd.sipb-xen =================================================================== --- /trunk/packages/sipb-xen-console/files/etc/motd.sipb-xen (revision 385) +++ /trunk/packages/sipb-xen-console/files/etc/motd.sipb-xen (revision 386) @@ -1,3 +1,3 @@ -Type Ctrl-] to escape from the console +Type Ctrl-e, then c, then . to escape from the console Index: unk/packages/sipb-xen-console/files/etc/ssh/ssh_config.sipb-xen =================================================================== --- /trunk/packages/sipb-xen-console/files/etc/ssh/ssh_config.sipb-xen (revision 385) +++ (revision ) @@ -1,47 +1,0 @@ - -# This is the ssh client system-wide configuration file. See -# ssh_config(5) for more information. This file provides defaults for -# users, and the values can be changed in per-user configuration files -# or on the command line. - -# Configuration data is parsed as follows: -# 1. command line options -# 2. user-specific file -# 3. system-wide file -# Any configuration value is only changed the first time it is set. -# Thus, host-specific definitions should be at the beginning of the -# configuration file, and defaults at the end. - -# Site-wide defaults for some commonly used options. For a comprehensive -# list of available options, their meanings and defaults, please see the -# ssh_config(5) man page. - -Host * - SendEnv VM_NAME -# ForwardAgent no -# ForwardX11 no -# ForwardX11Trusted yes -# RhostsRSAAuthentication no -# RSAAuthentication yes -# PasswordAuthentication yes -# HostbasedAuthentication no -# BatchMode no -# CheckHostIP yes -# AddressFamily any -# ConnectTimeout 0 -# StrictHostKeyChecking ask -# IdentityFile ~/.ssh/identity -# IdentityFile ~/.ssh/id_rsa -# IdentityFile ~/.ssh/id_dsa -# Port 22 -# Protocol 2,1 -# Cipher 3des -# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc -# EscapeChar ~ -# Tunnel no -# TunnelDevice any:any -# PermitLocalCommand no - SendEnv LANG LC_* - HashKnownHosts yes - GSSAPIAuthentication yes - GSSAPIDelegateCredentials no Index: unk/packages/sipb-xen-console/files/etc/ssh/ssh_known_hosts =================================================================== --- /trunk/packages/sipb-xen-console/files/etc/ssh/ssh_known_hosts (revision 385) +++ (revision ) @@ -1,3 +1,0 @@ -|1|CoekhjakJDYiibQ38vZna+XKwCg=|Ts2GavZxl8KVEl++tnJnjqfn84s= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsoOOazVHn04z6s+kQnoFcw9fv7dGB9s/9H1QygYW9QAbvklWx0q4J8KGTATXCFwjooLNqjHYONOQ8x0h1fZPDmhdoHk24wH/EBUAAyhtrwTMpsgfqZwG7yuRpcbO382F3wRv6CIRYZ6hyIlm0Zt3680mO/u7l2wAFoMTyYwSdZ8Gl9p5Ay750TFCZoEI/Z4EQY5lGPHrHIXN+uo0Yus//AmWIzY9y3TSKabHz77rPGIzJc8Y4XjDqA7LzXCY+KGw2Of059AseVHNTCMo6KzVIKgdZoRBtiY7fD1l7ystgKL6lGJr4C1UyWoM41EVkDqsRJZ70C4Elcr1x/MrQFLEgQ== -|1|SFl+Ci6EXZcVvxvxDm4Cf85nGho=|InwYz5wWUf/NRbBQRa/TO3Lm2uQ= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsoOOazVHn04z6s+kQnoFcw9fv7dGB9s/9H1QygYW9QAbvklWx0q4J8KGTATXCFwjooLNqjHYONOQ8x0h1fZPDmhdoHk24wH/EBUAAyhtrwTMpsgfqZwG7yuRpcbO382F3wRv6CIRYZ6hyIlm0Zt3680mO/u7l2wAFoMTyYwSdZ8Gl9p5Ay750TFCZoEI/Z4EQY5lGPHrHIXN+uo0Yus//AmWIzY9y3TSKabHz77rPGIzJc8Y4XjDqA7LzXCY+KGw2Of059AseVHNTCMo6KzVIKgdZoRBtiY7fD1l7ystgKL6lGJr4C1UyWoM41EVkDqsRJZ70C4Elcr1x/MrQFLEgQ== -|1|52lp5FTRtu4Fyk8GvC3mH2idB+0=|fGJ+LwWltfUP9kC1fiMfJO5XrVk= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsoOOazVHn04z6s+kQnoFcw9fv7dGB9s/9H1QygYW9QAbvklWx0q4J8KGTATXCFwjooLNqjHYONOQ8x0h1fZPDmhdoHk24wH/EBUAAyhtrwTMpsgfqZwG7yuRpcbO382F3wRv6CIRYZ6hyIlm0Zt3680mO/u7l2wAFoMTyYwSdZ8Gl9p5Ay750TFCZoEI/Z4EQY5lGPHrHIXN+uo0Yus//AmWIzY9y3TSKabHz77rPGIzJc8Y4XjDqA7LzXCY+KGw2Of059AseVHNTCMo6KzVIKgdZoRBtiY7fD1l7ystgKL6lGJr4C1UyWoM41EVkDqsRJZ70C4Elcr1x/MrQFLEgQ== Index: /trunk/packages/sipb-xen-console/files/usr/bin/sipb-xen-consolesh =================================================================== --- /trunk/packages/sipb-xen-console/files/usr/bin/sipb-xen-consolesh (revision 385) +++ /trunk/packages/sipb-xen-console/files/usr/bin/sipb-xen-consolesh (revision 386) @@ -1,4 +1,2 @@ #!/bin/bash - -export VM_NAME="$USER" -ssh console@black-mesa +exec /usr/bin/console "$USER" Index: /trunk/packages/sipb-xen-remctl-auto/debian/changelog =================================================================== --- /trunk/packages/sipb-xen-remctl-auto/debian/changelog (revision 385) +++ /trunk/packages/sipb-xen-remctl-auto/debian/changelog (revision 386) @@ -1,2 +1,8 @@ +sipb-xen-remctl-auto (1.0.8) unstable; urgency=low + + * Add support for updating conserver when VMs are turned on and off + + -- Evan Broder Wed, 2 Apr 2008 00:40:23 -0400 + sipb-xen-remctl-auto (1.0.7) unstable; urgency=low Index: /trunk/packages/sipb-xen-remctl-auto/debian/control =================================================================== --- /trunk/packages/sipb-xen-remctl-auto/debian/control (revision 385) +++ /trunk/packages/sipb-xen-remctl-auto/debian/control (revision 386) @@ -3,10 +3,10 @@ Priority: extra Maintainer: SIPB Xen Project -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0) +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0) Standards-Version: 3.7.2 Package: sipb-xen-remctl-auto Architecture: all -Depends: ${misc:Depends}, remctl-server +Depends: ${misc:Depends}, remctl-server, sipb-xen-console-server Description: Installs the SIPB Xen automatic remctl management system This is our automatic remctl configuration management system. Index: /trunk/packages/sipb-xen-remctl-auto/debian/control.in =================================================================== --- /trunk/packages/sipb-xen-remctl-auto/debian/control.in (revision 385) +++ /trunk/packages/sipb-xen-remctl-auto/debian/control.in (revision 386) @@ -8,5 +8,5 @@ Package: sipb-xen-remctl-auto Architecture: all -Depends: ${misc:Depends}, remctl-server +Depends: ${misc:Depends}, remctl-server, sipb-xen-console-server Description: Installs the SIPB Xen automatic remctl management system This is our automatic remctl configuration management system. Index: /trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol =================================================================== --- /trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol (revision 385) +++ /trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol (revision 386) @@ -15,6 +15,11 @@ case "$ACTION" in - list|vcpu-list|destroy|uptime|shutdown) + list|vcpu-list|uptime) xm "$ACTION" "$MACHINE" + ;; + destroy|shutdown) + xm "$ACTION" "$MACHINE" + rm "/etc/conserver/conf.d/$MACHINE" + /usr/sbin/sipb-xen-update-conserver ;; install|create|reboot) @@ -28,4 +33,6 @@ if [ "$ACTION" = "install" ]; then xm create sipb-database machine_name="$ORIGMACHINE" installer="$ARG" installer_options="$MOREARGS" +# elif [ "$ACTION" = "copy" ]; then +# sipb-xen-duplicate ...etc... elif [ -n "$ARG" ]; then xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$ARG" @@ -33,4 +40,6 @@ xm create sipb-database machine_name="$ORIGMACHINE" fi + echo "console $ORIGMACHINE {}" >"/etc/conserver/conf.d/$MACHINE" + /usr/sbin/sipb-xen-update-conserver ;; list-long)