setup.sh: Add and use grep_i() - in-place grep.

[config/dotfiles.git] / ssh_config

diff --git a/ssh_config b/ssh_config
index 379130f301b6e8590b11f30c81537f4a2a1f3dc4..4f239be572edbac120dd58546a799d8193962098 100644 (file)
--- a/ssh_config
+++ b/ssh_config
@@ -29,10 +29,10 @@
 # Rules for all hosts.
 Host *
 
-# Force protocol version 2 which is more secure.
+# Force protocol version 2 which is more secure (default).
     Protocol 2
 
-# Disable X11 and agent forwarding for security reasons.
+# Disable X11 and agent forwarding for security reasons (defaults).
     ForwardX11 no
     ForwardAgent no
 # Don't trust remote X11 clients. If enabled allows bad admins complete access
@@ -48,27 +48,49 @@ Host *
     PasswordAuthentication yes
     PubkeyAuthentication yes
 
+# Use only authentication identity files configured in ~/.ssh/config even if
+# ssh-agent offers more identities.
+    IdentitiesOnly yes
+
+# Bind local forwardings to loopback only. This way no remote hosts can access
+# them (default).
+    GatewayPorts no
 # Abort if not all requested port forwardings can be set up.
     ExitOnForwardFailure yes
 
 # Allow using -M (ControlMaster) to create a master SSH session which
 # "tunnels" other connections to the same host, thus reducing the number of
 # authentications (which are relatively slow) and TCP connections. The master
-# sockets are stored in ~/.ssh (by default ControlPath is not set).
+# sockets are stored in ~/.ssh (by default ControlPath is not set). Using %r
+# (remote user name) might leak information to other users on the current
+# system (e.g. via netstat or lsof).
     ControlPath ~/.ssh/master-%l-%h-%p-%r
+# Automatically create a new master session if there's none yet or use an
+# existing one. This way the user doesn't have to use -M to enable a master
+# manually. Don't set this option to "yes" or all SSH commands try to become
+# the master session which is obviously not possible.
+    ControlMaster auto
+# When the connection for a master is closed (e.g. logout of remote shell),
+# move the master connection in the background. If there's no other active
+# connection using the master, close it after x seconds. This prevents the
+# client of the master connection from blocking because it waits for all
+# connections using it to terminate which is very annoying. The timeout
+# prevents stale master connections.
+    ControlPersist 10
 
 # Hash hosts in ~/.ssh/known_hosts to try to conceal the known hosts. Doesn't
 # help if the ssh hosts are stored in the shell's history file or in this file
 # as shortcut.
     HashKnownHosts yes
 
-# Don't permit running local commands.
+# Don't permit running local commands (default).
     PermitLocalCommand no
 
-# Don't send any environment variables.
+# Don't send any environment variables (default).
     SendEnv
 
-# Check host IP in known_hosts when connecting to detect DNS spoofing.
+# Check host IP in known_hosts when connecting to detect DNS spoofing
+# (default).
     CheckHostIP yes
-# Ask before adding any host keys to ~/.ssh/known_hosts.
+# Ask before adding any host keys to ~/.ssh/known_hosts (default).
     StrictHostKeyChecking ask