From 6f47ffd03831ad0b17b0eff4df73e93b87c8c061 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Mon, 20 Mar 2023 05:40:26 -0400 Subject: [PATCH] Latest --- home/.chezmoi.yaml.tmpl | 4 ++-- .../private_dot_ssh/run_onchanges_after_decrypt-ssh-keys.tmpl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/home/.chezmoi.yaml.tmpl b/home/.chezmoi.yaml.tmpl index ce811185..5825e2a5 100644 --- a/home/.chezmoi.yaml.tmpl +++ b/home/.chezmoi.yaml.tmpl @@ -8,7 +8,7 @@ {{- $githubUsername := (default "ProfessorManhattan" (env "GITHUB_USERNAME")) -}} {{- $gmailAddress := (default "blzalewski@gmail.com" (env "GMAIL_ADDRESS")) -}} {{- $gpgKeyId := (default "0xF0A300E4199A1C33" (env "KEYID")) -}} -{{- $hostname := (default "alpha" (env "HOSTNAME")) -}} +{{- $hostname := (default "alpha" (env "HOSTNAME_ID")) -}} {{- $locale := (output "echo" "$LANG") }} {{- $name := (default "Brian Zalewski" (env "FULL_NAME")) -}} {{- $restricted := (default false (env "WORK_ENVIRONMENT")) -}} @@ -106,7 +106,7 @@ {{- if not (env "PUBLIC_SERVICES_DOMAIN") -}} {{- $domain = promptStringOnce $data.user "domain" "Domain name" $domain -}} {{- end -}} -{{- if not (env "HOSTNAME") -}} +{{- if not (env "HOSTNAME_ID") -}} {{- $hostname = promptStringOnce $data.host "hostname" "Hostname ID" $hostname -}} {{- end -}} diff --git a/home/private_dot_ssh/run_onchanges_after_decrypt-ssh-keys.tmpl b/home/private_dot_ssh/run_onchanges_after_decrypt-ssh-keys.tmpl index 72dd0edc..30a8bbb3 100644 --- a/home/private_dot_ssh/run_onchanges_after_decrypt-ssh-keys.tmpl +++ b/home/private_dot_ssh/run_onchanges_after_decrypt-ssh-keys.tmpl @@ -20,5 +20,6 @@ find "{{ .chezmoi.sourceDir }}/home/.chezmoitemplates/ssh" -type f | while read logg info "Applying appropriate permissions on $HOME/.ssh/$(basename "$SSH_FILE")" chmod 600 "$HOME/.ssh/$(basename "$SSH_FILE")" fi -fi +done + {{ end -}}