QA CSP SSH config.

.gitconfig

@@ -10,7 +10,7 @@
     empty-commit = commit --allow-empty
 	exec = "!exec "
     ff = merge --no-edit --ff-only master
-    fixup = !cd "${GIT_PREFIX:-}" && git commit --fixup $(git last-commit)
+    fixup = !cd "${GIT_PREFIX:-$PWD}" && git commit --fixup $(git last-commit)
     forget = reset HEAD^
     merg = merge --no-edit
     posh = push --set-upstream origin HEAD
@@ -21,7 +21,7 @@
     serve-git = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
     serve-http = !git update-server-info && cd .git && python -m SimpleHTTPServer
     shove = push --force-with-lease
-    squash = !cd "${GIT_PREFIX:-}" && git commit --squash $(git last-commit)
+    squash = !cd "${GIT_PREFIX:-$PWD}" && git commit --squash $(git last-commit)
     staash = stash --all
     stat = status --short --branch
     tag-version = !git tag --annotate --force --message "v$(cat VERSION)" "v$(cat VERSION)"

.ssh/config.d/20_bullguard

@@ -46,6 +46,16 @@ User ec2-user
 Host 172.20.0.233
 User ec2-user
 
+Host 172.16.*.*
+IdentityFile ~/.ssh/bullguard-dev_rsa
+User ubuntu
+ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
+
+Host 172.17.*.*
+IdentityFile ~/.ssh/bullguard-qa_rsa
+User ubuntu
+ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
+
 Host 172.20.*.*
 IdentityFile ~/.ssh/bullguard-staging_rsa
 User ubuntu