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

# Conflicts: # .gitsecret/paths/mapping.cfg
setting up giskard conf directory with caddy.conf encrypted
2021-10-10 13:12:46 -07:00 · 2021-10-10 12:55:44 -07:00
3 changed files with 5 additions and 0 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/giskard/caddy.conf.secret
+++ b/conf/giskard/caddy.conf.secret
--- a/conf/giskard/script
+++ b/conf/giskard/script
@ -0,0 +1,4 @@
+#!/bin/bash
+echo running custom script for $INSTANCE
+source ${CONF_SHARED_DIR}/aws/aws.env
+
Author	SHA1	Message	Date
Kebler Network System Administrator	44cd58d03d	Merge remote-tracking branch 'origin/master' into giskard # Conflicts: # .gitsecret/paths/mapping.cfg	2021-10-10 13:12:46 -07:00
Kebler Network System Administrator	31cdada20c	setting up giskard conf directory with caddy.conf encrypted	2021-10-10 12:55:44 -07:00