adjust tramp socket path

this has to match .ssh/config
ControlPath ~/.ssh/sockets/ssh.%r.%n.%p

Signed-off-by: Andreas Gerler <baronNOSPAMbundesbrandschatzamt.de>

diff --git a/bba.org b/bba.org
index 91e19ecd82507a1629fd1572a61b5358baf605be..013f59411e1d446a27b7d07c03a54d1a7a8d9feb 100644 (file)
--- a/bba.org
+++ b/bba.org
@@ -969,11 +969,29 @@ Use our default socket files
 
 #+BEGIN_SRC emacs-lisp
   (if (file-accessible-directory-p "~/.ssh/sockets")
-  (setq tramp-ssh-controlmaster-options "-o ControlMaster=auto -o ControlPath='~/.ssh/sockets/ssh.%%C' -o ControlPersist=600"))
+  (setq tramp-ssh-controlmaster-options "-o ControlMaster=auto -o ControlPath='~/.ssh/sockets/ssh.%%r.%%n.%%p' -o ControlPersist=600"))
 #+END_SRC
 
 TRAMP gcloud ssh
 
+#+NAME:gssh
+#+begin_src sh :eval never :tangle no
+  #!/bin/bash
+
+  HOST="$1"
+
+  if [[ $HOST = *"@"* ]] ; then
+      USER=$(echo $HOST | cut -d'@' -f1)
+      HOST=$(echo $HOST | cut -d'@' -f2)
+  fi
+
+  gcloud config list | grep 'Your active'
+  ZONE=$(gcloud compute instances list |grep -E "^$HOST[[:space:]]" | awk '{print $2}')
+  echo zone: $ZONE
+  gcloud compute ssh --zone=$ZONE --tunnel-through-iap "$@"
+#+end_src
+
+
 #+begin_src emacs-lisp
   (require 'tramp)
   (eval-after-load "tramp"