summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.bashrc10
-rw-r--r--.gitconfig.work.inc9
2 files changed, 1 insertions, 18 deletions
diff --git a/.bashrc b/.bashrc
index 594d391..03fd0ab 100644
--- a/.bashrc
+++ b/.bashrc
@@ -129,14 +129,6 @@ alias assume=". assume"
# ==== Functions
gitlab_token() {
- GITLAB_TOKEN=$(pass mbition/git | grep token | awk '{ print $NF}')
- export GITLAB_TOKEN
-}
-gitlab_su_token() {
- GITLAB_TOKEN=$(pass mbition/git | grep su_token | awk '{ print $NF}')
- export GITLAB_TOKEN
-}
-gitlab_baas_token() {
- GITLAB_TOKEN=$(pass mbition/git | grep baas_token | awk '{ print $NF}')
+ GITLAB_TOKEN="$(swf-credential-helper shell get 'git.swf.i.mercedes-benz.com')"
export GITLAB_TOKEN
}
diff --git a/.gitconfig.work.inc b/.gitconfig.work.inc
index 3d34636..8ff9fed 100644
--- a/.gitconfig.work.inc
+++ b/.gitconfig.work.inc
@@ -6,56 +6,47 @@
username = AABDELH
signingkey = 7A690E8DFE36C63A99355B1B76296F290BE3A016
-# Git configuration for dev (git.swf-dev.i.mercedes-benz.com)
[url "https://git.swf-dev.i.mercedes-benz.com/"]
insteadOf = https://git.swf-dev.i.mercedes-benz.com/
insteadOf = https://[email protected]/
insteadOf = https://[email protected]/
insteadOf = ssh://git.swf-dev.i.mercedes-benz.com:7999/
insteadOf = ssh://[email protected]:7999/
-
[http "https://git.swf-dev.i.mercedes-benz.com/"]
sslVerify = true
keepAliveIdle = 120
emptyAuth = false
proactiveAuth = basic
-
[credential "https://git.swf-dev.i.mercedes-benz.com"]
helper =
helper = !'/Users/AABDELH/.local/bin/swf-credential-helper' 'git'
-# Git configuration for integration (git.swf-int.i.mercedes-benz.com)
[url "https://git.swf-int.i.mercedes-benz.com/"]
insteadOf = https://git.swf-int.i.mercedes-benz.com/
insteadOf = https://[email protected]/
insteadOf = https://[email protected]/
insteadOf = ssh://git.swf-int.i.mercedes-benz.com:7999/
insteadOf = ssh://[email protected]:7999/
-
[http "https://git.swf-int.i.mercedes-benz.com/"]
sslVerify = true
keepAliveIdle = 120
emptyAuth = false
proactiveAuth = basic
-
[credential "https://git.swf-int.i.mercedes-benz.com"]
helper =
helper = !'/Users/AABDELH/.local/bin/swf-credential-helper' 'git'
-# Git configuration for production (git.swf.i.mercedes-benz.com)
[url "https://git.swf.i.mercedes-benz.com/"]
insteadOf = https://git.swf.i.mercedes-benz.com/
insteadOf = https://[email protected]/
insteadOf = https://[email protected]/
insteadOf = ssh://git.swf.i.mercedes-benz.com:7999/
insteadOf = ssh://[email protected]:7999/
-
[http "https://git.swf.i.mercedes-benz.com/"]
sslVerify = true
keepAliveIdle = 120
emptyAuth = false
proactiveAuth = basic
-
[credential "https://git.swf.i.mercedes-benz.com"]
helper =
helper = !'/Users/AABDELH/.local/bin/swf-credential-helper' 'git'