ssh and tmux configuration fixes

[perso/Immae/Config/Ansible.git] / roles / contexts / fretlink / templates / environment.j2

diff --git a/roles/contexts/fretlink/templates/environment.j2 b/roles/contexts/fretlink/templates/environment.j2
index bb9328a5e190b605e7eed25739661cb07ff4d9b2..e5e2c64da3dc733be70a702a63fedf353add5a1c 100644 (file)
--- a/roles/contexts/fretlink/templates/environment.j2
+++ b/roles/contexts/fretlink/templates/environment.j2
@@ -8,6 +8,14 @@ if ! $(echo "$PATH" | grep -q "$DIR/toolbox/scripts"); then
   PATH="$DIR/toolbox/scripts:$PATH"
 fi
 
   PATH="$DIR/toolbox/scripts:$PATH"
 fi
 

+p() {
+  if [ -z "$2" ]; then
+    pass show Travail/Fretlink/$1
+  else
+    pass show Travail/Fretlink/$1 | grep "^$2:" | sed -e "s/^$2: //"
+  fi | head -n1
+}
+

 build_macaroon() {
   if [ "$1" = "--old" ]; then
     shift
 build_macaroon() {
   if [ "$1" = "--old" ]; then
     shift


@@ -178,6 +186,7 @@ if [ "$APP" = "notifier" ]; then
   export TEMPLATES_ASSETS_BASE_URL="http://dummy/"
   export TRANSPOREON_USER="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/ApiTest subkey=Login') }}"
   export TRANSPOREON_PASSWORD="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/ApiTest') }}"
   export TEMPLATES_ASSETS_BASE_URL="http://dummy/"
   export TRANSPOREON_USER="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/ApiTest subkey=Login') }}"
   export TRANSPOREON_PASSWORD="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/ApiTest') }}"

+  export TRANSPOREON_HOST="api.test.transporeon.com"

   export TRANSPOREON_CALLBACK_USER="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/NotifierCallbackTest subkey=Login') }}"
   export TRANSPOREON_CALLBACK_PASSWORD="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/NotifierCallbackTest') }}"
 
   export TRANSPOREON_CALLBACK_USER="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/NotifierCallbackTest subkey=Login') }}"
   export TRANSPOREON_CALLBACK_PASSWORD="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/NotifierCallbackTest') }}"