From 098ace6509d95b1d335cfa5e7146418a63524d9a Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Mon, 30 Jan 2023 07:47:45 +0000 Subject: [PATCH] Update 5 files - /home/.chezmoitemplates/secrets/ghorg-fallback - /home/.chezmoitemplates/secrets/slack-term-fallback - /home/.chezmoitemplates/secrets/ngrok-fallback - /home/.chezmoitemplates/secrets/tailscale-fallback - /home/.chezmoitemplates/secrets/gist-fallback --- home/.chezmoitemplates/secrets/ghorg-fallback | 4 ++-- home/.chezmoitemplates/secrets/gist-fallback | 2 +- home/.chezmoitemplates/secrets/ngrok-fallback | 2 +- home/.chezmoitemplates/secrets/slack-term-fallback | 2 +- home/.chezmoitemplates/secrets/tailscale-fallback | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/home/.chezmoitemplates/secrets/ghorg-fallback b/home/.chezmoitemplates/secrets/ghorg-fallback index 71594f4b..acdecda1 100644 --- a/home/.chezmoitemplates/secrets/ghorg-fallback +++ b/home/.chezmoitemplates/secrets/ghorg-fallback @@ -149,7 +149,7 @@ GHORG_EXIT_CODE_ON_CLONE_ISSUES: 1 # Add your GitHub token # flag (--token, -t) eg: --token=bGVhdmUgYSBjb21tZW50IG9uIGlzc3VlIDY2 -GHORG_GITHUB_TOKEN: {{ .user.GITHUB_READ_TOKEN }} +GHORG_GITHUB_TOKEN: "{{ env "GITHUB_READ_TOKEN" }}" # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ # |G|I|T|L|A|B| |S|P|E|C|I|F|I|C| @@ -157,7 +157,7 @@ GHORG_GITHUB_TOKEN: {{ .user.GITHUB_READ_TOKEN }} # Add your GitLab token # flag (--token, -t) eg: --token=bGVhdmUgYSBjb21tZW50IG9uIGlzc3VlIDY2 -GHORG_GITLAB_TOKEN: {{ .user.GITLAB_READ_TOKEN }} +GHORG_GITLAB_TOKEN: "{{ env "GITLAB_READ_TOKEN" }}" # clones repos in a directory structure that matches gitlab namespaces eg company/unit/subunit/app would clone into ghorg/org/unit/subunit/app # flag (--preserve-dir) diff --git a/home/.chezmoitemplates/secrets/gist-fallback b/home/.chezmoitemplates/secrets/gist-fallback index e71cd0ad..99a3ce74 100644 --- a/home/.chezmoitemplates/secrets/gist-fallback +++ b/home/.chezmoitemplates/secrets/gist-fallback @@ -1,5 +1,5 @@ #!/usr/bin/env bash -echo "{{ .user.GITHUB_GIST_TOKEN }}" > ~/.gist +echo "{{ env "GITHUB_GIST_TOKEN" }}" > ~/.gist gist $* rm -f ~/.gist diff --git a/home/.chezmoitemplates/secrets/ngrok-fallback b/home/.chezmoitemplates/secrets/ngrok-fallback index a6bc0e4d..89af36bc 100644 --- a/home/.chezmoitemplates/secrets/ngrok-fallback +++ b/home/.chezmoitemplates/secrets/ngrok-fallback @@ -1,2 +1,2 @@ version: "2" -authtoken: '{{ .user.NGROK_AUTH_TOKEN }}' +authtoken: '{{ env "NGROK_AUTH_TOKEN" }}' diff --git a/home/.chezmoitemplates/secrets/slack-term-fallback b/home/.chezmoitemplates/secrets/slack-term-fallback index 61a15c19..7b986dd0 100644 --- a/home/.chezmoitemplates/secrets/slack-term-fallback +++ b/home/.chezmoitemplates/secrets/slack-term-fallback @@ -1,5 +1,5 @@ { - "slack_token": "{{ .user.SLACK_API_TOKEN }}", + "slack_token": "{{ env "SLACK_API_TOKEN" }}", "sidebar_width": 3, "notify": "mention", "emoji": true, diff --git a/home/.chezmoitemplates/secrets/tailscale-fallback b/home/.chezmoitemplates/secrets/tailscale-fallback index 34becde3..f6c36d4d 100644 --- a/home/.chezmoitemplates/secrets/tailscale-fallback +++ b/home/.chezmoitemplates/secrets/tailscale-fallback @@ -13,7 +13,7 @@ if [ -d /Applications ] && [ -d System ]; then fi ### Connect to Tailscale network -if command -v tailscale > /dev/null && [ "{{ .user.TAILSCALE_AUTH_KEY }}" != "" ]; then +if command -v tailscale > /dev/null && [ "{{ env "TAILSCALE_AUTH_KEY" }}" != "" ]; then logg info 'Connecting to Tailscale with user-defined authentication key' - tailscale up --authkey={{ .user.TAILSCALE_AUTH_KEY }} && logg success 'Connected to Tailscale network' + tailscale up --authkey={{ env "TAILSCALE_AUTH_KEY" }} && logg success 'Connected to Tailscale network' fi