From 40582c48e6f2975ea496420f7d68b8a037814f48 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Wed, 2 Apr 2008 00:58:22 -0400 Subject: [PATCH] Change to using conserver instead of ssh svn path=/trunk/packages/sipb-xen-console/; revision=386 --- debian/changelog | 6 ++++ debian/control | 2 +- debian/control.in | 2 +- debian/rules | 1 - files/etc/conserver/conserver.cf.sipb-xen | 6 ++++ files/etc/motd.sipb-xen | 2 +- files/etc/ssh/ssh_config.sipb-xen | 47 ----------------------------- files/etc/ssh/ssh_known_hosts | 3 -- files/usr/bin/sipb-xen-consolesh | 4 +-- 9 files changed, 16 insertions(+), 57 deletions(-) create mode 100644 files/etc/conserver/conserver.cf.sipb-xen delete mode 100644 files/etc/ssh/ssh_config.sipb-xen delete mode 100644 files/etc/ssh/ssh_known_hosts diff --git a/debian/changelog b/debian/changelog index 1a938c6..96ed7d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +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 * /etc/modules is no longer managed by this package diff --git a/debian/control b/debian/control index 4cbdbcf..45c1c52 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Package: sipb-xen-console Architecture: all 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 It makes sure that necessary tools are available. diff --git a/debian/control.in b/debian/control.in index 09e65d8..cde340c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,7 +9,7 @@ Package: sipb-xen-console Architecture: all 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 It makes sure that necessary tools are available. diff --git a/debian/rules b/debian/rules index 2ac6a8b..c1204e3 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,6 @@ DEB_DIVERT_FILES_sipb-xen-console += \ /etc/nscd.conf \ /etc/nsswitch.conf \ /etc/pam.d/ssh \ - /etc/ssh/ssh_config \ /etc/ssh/sshd_config include /usr/share/cdbs/1/rules/debhelper.mk diff --git a/files/etc/conserver/conserver.cf.sipb-xen b/files/etc/conserver/conserver.cf.sipb-xen new file mode 100644 index 0000000..a480b85 --- /dev/null +++ b/files/etc/conserver/conserver.cf.sipb-xen @@ -0,0 +1,6 @@ +# default config for console +config * { + master black-mesa; + port 3109; + sslenabled yes; +} diff --git a/files/etc/motd.sipb-xen b/files/etc/motd.sipb-xen index e5399d3..cf35576 100644 --- a/files/etc/motd.sipb-xen +++ b/files/etc/motd.sipb-xen @@ -1,3 +1,3 @@ -Type Ctrl-] to escape from the console +Type Ctrl-e, then c, then . to escape from the console diff --git a/files/etc/ssh/ssh_config.sipb-xen b/files/etc/ssh/ssh_config.sipb-xen deleted file mode 100644 index 97ca8e8..0000000 --- a/files/etc/ssh/ssh_config.sipb-xen +++ /dev/null @@ -1,47 +0,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 diff --git a/files/etc/ssh/ssh_known_hosts b/files/etc/ssh/ssh_known_hosts deleted file mode 100644 index 0aa35d1..0000000 --- a/files/etc/ssh/ssh_known_hosts +++ /dev/null @@ -1,3 +0,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== diff --git a/files/usr/bin/sipb-xen-consolesh b/files/usr/bin/sipb-xen-consolesh index 6e100f9..617df6b 100755 --- a/files/usr/bin/sipb-xen-consolesh +++ b/files/usr/bin/sipb-xen-consolesh @@ -1,4 +1,2 @@ #!/bin/bash - -export VM_NAME="$USER" -ssh console@black-mesa +exec /usr/bin/console "$USER" -- 1.7.9.5