X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/edf75ba8f572556ae617a4400fc25e29d245949e..dd9f1117c0cc52364d850cc5b51fd0ee1e13099a:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 3825eed..ebe9c19 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -41,11 +41,19 @@ Host alan.madduck.net | alan
 Host swan.madduck.net | swan
   ForwardAgent yes
   Hostname swan.madduck.net
+Host irc-host.madduck.net | irc-host
+  User madduck
+  HostKeyAlias swan.madduck.net
+  ConnectTimeout 60
 
 Host pulse.madduck.net | pulse
   ForwardAgent yes
   Hostname pulse.madduck.net
 
+Host seamus.madduck.net | seamus
+  ForwardAgent yes
+  Hostname seamus.madduck.net
+
 ### KHYBER KVM HOST
 
 Host khyber.madduck.net | khyber
@@ -146,6 +154,11 @@ Host franz.ifi.uzh.ch | franz
 Host piper.madduck.net | piper
   Hostname piper.madduck.net
 
+### CIRRUS / HETZNER
+
+Host cirrus.madduck.net | cirrus
+  Hostname cirrus.madduck.net
+
 ### ARNOLD / GPLHOST
 
 Host arnold.madduck.net | arnold
@@ -153,10 +166,6 @@ Host arnold.madduck.net | arnold
 Host arnold-host | arnold-host.madduck.net
   Hostname arnold-host.madduck.net
   User xen05
-Host irc
-  User madduck
-  Hostname arnold.madduck.net
-  ConnectTimeout 60
 
 ### GERN
 
@@ -257,13 +266,13 @@ Host fishbowl | fishbowl.rw.madduck.net
 
 ### LOCAL VIRT HOSTS
 
-Host *.virt | 192.168.122.* | red | green | blue | yellow | black | white | orange | violet
+Host red | green | blue | yellow | black | white | orange | violet | wafer
+  VerifyHostKeyDNS no
   CheckHostIP no
   ForwardAgent yes
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
   ControlMaster no
-  User root
   CanonicalDomains virt
   CanonicalizeHostname yes
   CanonicalizeFallbackLocal no
@@ -271,6 +280,10 @@ Host *.virt | 192.168.122.* | red | green | blue | yellow | black | white | oran
 
 ### DEBIAN
 
+Match host *.debian.org
+  StrictHostKeyChecking ask
+  VerifyHostKeyDNS ask
+
 Host scm.alioth.debian.org
   HostKeyAlias moszumanska.debian.org
   User madduck
@@ -918,64 +931,26 @@ Host github.com | github
 
 ### DEFAULTS
 
+Match host *.madduck.net
+  StrictHostKeyChecking ask
+  VerifyHostKeyDNS ask
+
 Host *
-# AddressFamily any
-# BatchMode no
-# CheckHostIP yes
-  Cipher blowfish
-# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr
-# ClearAllForwardings no
-# Compression no
-# CompressionLevel 6
-# ConnectionAttempts 1
+  IgnoreUnknown *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
   ControlPersist 30
-## DSAAuthentication no
-# DynamicForward off
-# EnableSSHKeysign no
-# EscapeChar ~
   ExitOnForwardFailure yes
   ForwardAgent no
   ForwardX11 no
-# ForwardX11Trusted yes
-# GatewayPorts no
-# GlobalKnownHostsFile /etc/ssh/ssh_known_hosts
+  ForwardX11Trusted no
   HashKnownHosts no
-# HostbasedAuthentication no
-  HostKeyAlgorithms ssh-rsa
-# IdentityFile ~/.ssh/identity
-  IdentityFile2 ~/.ssh/id_rsa
-  IPQoS lowdelay throughput
-# KbdInteractiveDevices pam
-# LocalCommand none
-# LocalForward none
-# LogLevel INFO
-  MACs hmac-sha1,umac-64@openssh.com,hmac-ripemd160,hmac-sha1-96,hmac-md5,hmac-md5-96
-# NoHostAuthenticationForLocalhost no
   NumberOfPasswordPrompts 2
   PasswordAuthentication yes
-# PermitLocalCommand no
-# Port 22
-# PreferredAuthentications gssapi-with-mic,hostbased,publickey,keyboard-interactive,password
   Protocol 2
-# ProxyCommand
-# PubkeyAuthentication yes
-# RekeyLimit 1G-4G #depends on cipher
-# RemoteForward
-# RhostsRSAAuthentication no
-# RSAAuthentication no
-# ServerAliveCountMax 3
   ServerAliveInterval 45
-  SetupTimeOut 10
-# SmartcardDevice off
   StrictHostKeyChecking yes
-# TCPKeepAlive yes
-# Tunnel no
-# TunnelDevice any:any
-# UsePrivilegedPort no
-# UserKnownHostsFile ~/.ssh/known_hosts
-# VerifyHostKeyDNS no
+  UpdateHostKeys ask
+  VerifyHostKeyDNS ask
   VisualHostKey no
-# XAuthLocation /usr/X11R6/bin/xauth