From 097d9254ffdb3b2f364d43b5465c9192535ec6d3 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 15 Apr 2018 16:38:42 +0300
Subject: [PATCH] QA CSP SSH config.
---
.gitconfig | 4 ++--
.ssh/config.d/20_bullguard | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.gitconfig b/.gitconfig
index 41340d7..cc587dd 100644
--- a/.gitconfig
+++ b/.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)"
diff --git a/.ssh/config.d/20_bullguard b/.ssh/config.d/20_bullguard
index c502cfb..f664d43 100644
--- a/.ssh/config.d/20_bullguard
+++ b/.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
--
GitLab