changes

bashrc

@@ -65,7 +65,7 @@ export PYTHONPATH=~/python/
 alias sfreversion='perl-reversion --bump lib/SocialFlow/Web.pm;git add lib/SocialFlow/Web.pm;git commit -m "Bumping sf-web version"'
 alias sfcpanm='cpanm --mirror http://cpan-mirror.dev.saturn.sfsrv.net:25123 --mirror-only' 
 alias bump='perl-reversion --bump '
-alias vi='vi -p'
+alias vi='vim -p'
 alias lessr='less -R'
 alias shadowpaste='nopaste -s Shadowcat '
 alias netstat='netstat --wide'
@@ -91,3 +91,7 @@ function refresh_gpga() {
 }
 
 export FZF_DEFAULT_COMMAND='ag -g ""'
+
+function filecurl {
+    cat $1 | xargs -n 1 curl -LO
+}

ssh-config

@@ -7,14 +7,30 @@ Host *.priv.sf
   StrictHostKeyChecking false
   KbdInteractiveAuthentication false
 
+Host *.mars.sfsrv.net
+  User appuser
+  ConnectTimeout 30
+  ProxyCommand docker exec -i marsvpn nc -q0 %h %p 2>/dev/null
+  StrictHostKeyChecking false
+  KbdInteractiveAuthentication false
+
+Host *.saturn.sfsrv.net
+  User appuser
+  ConnectTimeout 30
+  #ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null
+  StrictHostKeyChecking false
+  KbdInteractiveAuthentication false
+
+
+
 Host *.sflow.us
   User appuser
   StrictHostKeyChecking false
 #  IdentityFile ~/.ssh/2016_prod_home.key
 #
-Host *.sfsrv.net
-  User appuser
-  StrictHostKeyChecking false
+#Host *.sfsrv.net
+#  User appuser
+#  StrictHostKeyChecking false
 #
 #Host dev-home.priv.sf
 #    User root
@@ -23,13 +39,14 @@ Host *.sfsrv.net
 #
 
 #
-#Host *.saturn.sfsrv.net
-#  IdentityFile ~/.ssh/2016_saturn_home.key
-#  ConnectTimeout 30
-#  ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null
-#  StrictHostKeyChecking false
-#  KbdInteractiveAuthentication false
-#
+Host joe2.home.saturn.sfsrv.net
+  IdentityFile ~/.ssh/2016_saturn_home.key
+  ConnectTimeout 30
+  StrictHostKeyChecking false
+  KbdInteractiveAuthentication false
+  LocalForward *:5432 pg-site.dev.saturn.sfsrv.net:5432
+  LocalForward *:7006 redis-2.dev.saturn.sfsrv.net:7006
+
 
 #Host *.saturn.sflow.us
 #  IdentityFile ~/.ssh/2016_saturn_home.key