From f81ffb448084071c6424714ecb0dabdfba6748c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 13:02:03 +0200 Subject: [PATCH] Update secrets --- secrets/env | 17 ++++++++++------- secrets/secrets.sh | 5 +++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/secrets/env b/secrets/env index 6f1f0d11..55e10bcc 100755 --- a/secrets/env +++ b/secrets/env @@ -6,16 +6,19 @@ export PASS_MUSPY="$(pass entertainment/muspy.com | head -n 1)" export PASS_ARIA2="$(pass linux/aria2 | head -n 1)" export PASS_MPD="$(pass linux/mpd | head -n 1)" export PASS_MPD_ADMIN="$(pass linux/mpd-admin | head -n 1)" -export PASS_IPMI="$(pass reekynet/idrac | head -n 1)" -export PASS_MQTT="$(pass reekynet/mqtt.reekynet.com | head -n 1)" +export PASS_IPMI="$(pass selfhosted/idrac | head -n 1)" +export PASS_MQTT="$(pass selfhosted/mqtt.reekynet.com | head -n 1)" export ME_FULLNAME="$(pass me | head -n 1)" export ME_ADDRESS="$(pass me | rg 'address' | cut -d' ' -f2-)" export ME_PHONE="$(pass me | rg 'phone' | cut -d' ' -f2-)" -export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass reekynet/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" -export WIREGUARD_MIRKWOOD_PUBKEY="$(pass reekynet/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" -export WIREGUARD_MIRKWOOD_PSK="$(pass reekynet/wireguard/mirkwood | grep PreSharedKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PRIVKEY="$(pass selfhosted/wireguard/mirkwood | grep PrivateKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PUBKEY="$(pass selfhosted/wireguard/mirkwood | grep PublicKey | cut -d' ' -f2-)" +export WIREGUARD_MIRKWOOD_PSK="$(pass selfhosted/wireguard/mirkwood | grep PreSharedKey | cut -d' ' -f2-)" -export WIREGUARD_MORIA_PRIVKEY="$(pass reekynet/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)" -export WIREGUARD_MORIA_PUBKEY="$(pass reekynet/wireguard/moria | grep PublicKey | cut -d' ' -f2-)" +export WIREGUARD_MORIA_PRIVKEY="$(pass selfhosted/wireguard/moria | grep PrivateKey | cut -d' ' -f2-)" +export WIREGUARD_MORIA_PUBKEY="$(pass selfhosted/wireguard/moria | grep PublicKey | cut -d' ' -f2-)" + +export EMAIL_MARKO_PASS="$(pass email/marko@korhonen.cc | head -1)" +export EMAIL_ADMIN_PASS="$(pass email/admin@korhonen.cc | head -1)" diff --git a/secrets/secrets.sh b/secrets/secrets.sh index 724a5b9b..535020d6 100755 --- a/secrets/secrets.sh +++ b/secrets/secrets.sh @@ -23,4 +23,9 @@ export WIREGUARD_MIRKWOOD_PSK="$WIREGUARD_MIRKWOOD_PSK" export WIREGUARD_MORIA_PRIVKEY="$WIREGUARD_MORIA_PRIVKEY" export WIREGUARD_MORIA_PUBKEY="$WIREGUARD_MORIA_PUBKEY" + +export EMAIL_MARKO_PASS="$EMAIL_MARKO_PASS" +export EMAIL_ADMIN_PASS="$EMAIL_MARKO_PASS" SECRET + +chmod 600 $DOTREPO/secrets/secrets