From 143aff16339c50dfcdab3ba37b4258cf54623564 Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Wed, 12 Jan 2022 14:33:18 -0800 Subject: [PATCH] Move SOPS test key to its own directory Signed-off-by: Todd Malsbary Change-Id: I6a3ae140e4155e80433b201bad2650a0f94b22a3 --- deploy/site/{vm => secrets}/sops.asc | 0 deploy/site/vm/vm.sh | 9 +++++---- 2 files changed, 5 insertions(+), 4 deletions(-) rename deploy/site/{vm => secrets}/sops.asc (100%) diff --git a/deploy/site/vm/sops.asc b/deploy/site/secrets/sops.asc similarity index 100% rename from deploy/site/vm/sops.asc rename to deploy/site/secrets/sops.asc diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh index 1308854..20cae73 100755 --- a/deploy/site/vm/vm.sh +++ b/deploy/site/vm/vm.sh @@ -15,14 +15,15 @@ SITE_BRANCH=${SITE_BRANCH:-"master"} SITE_PATH=${SITE_PATH:-"deploy/site/vm"} FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"} +FLUX_SOPS_PRIVATE_KEY="${SCRIPTDIR}/../secrets/sops.asc" # !!!NOTE!!! THE KEYS USED BELOW ARE FOR TEST PURPOSES ONLY. DO NOT # USE THESE OUTSIDE OF THIS ICN VIRTUAL TEST ENVIRONMENT. function build_source { # First decrypt the existing site YAML, otherwise we'll be # attempting to encrypt it twice below - if [[ -f ${SCRIPTDIR}/sops.asc ]]; then - gpg --import ${SCRIPTDIR}/sops.asc + if [[ -f ${FLUX_SOPS_PRIVATE_KEY} ]]; then + gpg --import ${FLUX_SOPS_PRIVATE_KEY} sops_decrypt_site ${SCRIPTDIR}/site.yaml fi @@ -41,11 +42,11 @@ function build_source { sops_encrypt_site ${SCRIPTDIR}/site.yaml ${FLUX_SOPS_KEY_NAME} # ONLY FOR TEST ENVIRONMENT: save the private key used - export_gpg_private_key ${FLUX_SOPS_KEY_NAME} >${SCRIPTDIR}/sops.asc + export_gpg_private_key ${FLUX_SOPS_KEY_NAME} >${FLUX_SOPS_PRIVATE_KEY} } function deploy { - gpg --import ${SCRIPTDIR}/sops.asc + gpg --import ${FLUX_SOPS_PRIVATE_KEY} flux_create_site ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH} ${FLUX_SOPS_KEY_NAME} } -- 2.16.6