Merge remote-tracking branch 'origin/master' into giskard

# Conflicts: # .gitsecret/paths/mapping.cfg
2021-10-10 13:12:46 -07:00 · 2021-10-10 13:12:46 -07:00 · 44cd58d03d
parent 31cdada20c 072c48c301
commit 44cd58d03d
3 changed files with 2 additions and 1 deletions
--- a/.gitsecret/paths/mapping.cfg
+++ b/.gitsecret/paths/mapping.cfg
@ -1 +1,2 @@
 conf/giskard/caddy.conf:574ef250a108d62bc48f59c9ce82087e9de65fe470361a5ebc35bde4d43c82d1
+conf/_shared/aws/aws_credentials:2a62843158398d2a4de0e6d6e769eab768d10b80f750ec69374048c02990caad
--- a/conf/_shared/aws/aws.env
+++ b/conf/_shared/aws/aws.env
@ -1,4 +1,4 @@
 echo setting AWS environment
 export AWS_CONFIG_FILE=$CONF_SHARED_DIR/aws/profiles
-export AWS_SHARED_CREDENTIALS_FILE=$CONF_SHARED_DIR/aws/credentials
+export AWS_SHARED_CREDENTIALS_FILE=$CONF_SHARED_DIR/aws/aws_credentials
 env | grep AWS
--- a/conf/_shared/aws/aws_credentials.secret
+++ b/conf/_shared/aws/aws_credentials.secret