From 9de3b66c56f73af4b9ff84765e3588b752f85fb8 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Wed, 1 Feb 2023 16:40:47 +0000 Subject: [PATCH] Update 55 files - /home/dot_gnupg/public/0xF0A300E4199A1C33.sig - /home/dot_gnupg/public/apt.hashicorp.sig - /home/dot_gnupg/public/linux.wazuh.sig - /home/dot_gnupg/public/qubes.uman.sig - /home/dot_ssh/authorized_keys.github.tmpl - /home/dot_ssh/endlessh/config.tmpl - /home/dot_ssh/endlessh/run_onchange_after_endlessh.tmpl - /home/dot_ssh/fail2ban/jail.local.tmpl - /home/dot_ssh/fail2ban/run_onchange_after_fail2ban.tmpl - /home/dot_ssh/private_config.tmpl - /home/dot_ssh/private_id_rsa.tmpl - /home/dot_ssh/private_ssh-audi.tmpl - /home/dot_ssh/private_ssh-blue.tmpl - /home/dot_ssh/private_ssh-fiat.tmpl - /home/dot_ssh/private_ssh-honda.tmpl - /home/dot_ssh/private_ssh-lab.pub.tmpl - /home/dot_ssh/private_ssh-lab.tmpl - /home/dot_ssh/private_ssh-mini.tmpl - /home/dot_ssh/private_ssh-red.tmpl - /home/dot_ssh/private_ssh-yellow.tmpl - /home/dot_ssh/run_onchanges_after_ensure-private-key.tmpl - /home/dot_ssh/run_onchanges_after_generate-public-keys.tmpl - /home/dot_ssh/ssh-authorized_keys.yubikey.tmpl - /home/dot_ssh/symlink_authorized_keys.tmpl - /home/dot_ssh/system/banner - /home/dot_ssh/system/run_onchange_after_sshd.tmpl - /home/dot_ssh/system/sshd_config.tmpl - /home/private_dot_gnupg/public/linux.wazuh.sig - /home/private_dot_gnupg/public/0xF0A300E4199A1C33.sig - /home/private_dot_gnupg/public/qubes.uman.sig - /home/private_dot_gnupg/public/apt.hashicorp.sig - /home/private_dot_ssh/endlessh/config.tmpl - /home/private_dot_ssh/endlessh/run_onchange_after_endlessh.tmpl - /home/private_dot_ssh/fail2ban/jail.local.tmpl - /home/private_dot_ssh/fail2ban/run_onchange_after_fail2ban.tmpl - /home/private_dot_ssh/system/banner - /home/private_dot_ssh/system/run_onchange_after_sshd.tmpl - /home/private_dot_ssh/system/sshd_config.tmpl - /home/private_dot_ssh/private_ssh-mini.tmpl - /home/private_dot_ssh/symlink_authorized_keys.tmpl - /home/private_dot_ssh/private_ssh-audi.tmpl - /home/private_dot_ssh/private_ssh-lab.pub.tmpl - /home/private_dot_ssh/private_ssh-yellow.tmpl - /home/private_dot_ssh/private_config.tmpl - /home/private_dot_ssh/run_onchanges_after_generate-public-keys.tmpl - /home/private_dot_ssh/private_ssh-fiat.tmpl - /home/private_dot_ssh/private_ssh-blue.tmpl - /home/private_dot_ssh/private_ssh-red.tmpl - /home/private_dot_ssh/ssh-authorized_keys.yubikey.tmpl - /home/private_dot_ssh/private_ssh-honda.tmpl - /home/private_dot_ssh/authorized_keys.github.tmpl - /home/private_dot_ssh/private_id_rsa.tmpl - /home/private_dot_ssh/run_onchanges_after_ensure-private-key.tmpl - /home/private_dot_ssh/private_ssh-lab.tmpl - /home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl --- .../universal/run_onchange_before_91-configure-gpg.tmpl | 2 +- .../public/0xF0A300E4199A1C33.sig | 0 home/{dot_gnupg => private_dot_gnupg}/public/apt.hashicorp.sig | 0 home/{dot_gnupg => private_dot_gnupg}/public/linux.wazuh.sig | 0 home/{dot_gnupg => private_dot_gnupg}/public/qubes.uman.sig | 0 home/{dot_ssh => private_dot_ssh}/authorized_keys.github.tmpl | 0 home/{dot_ssh => private_dot_ssh}/endlessh/config.tmpl | 0 .../endlessh/run_onchange_after_endlessh.tmpl | 0 home/{dot_ssh => private_dot_ssh}/fail2ban/jail.local.tmpl | 0 .../fail2ban/run_onchange_after_fail2ban.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_config.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_id_rsa.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_ssh-audi.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_ssh-blue.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_ssh-fiat.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_ssh-honda.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_ssh-lab.pub.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_ssh-lab.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_ssh-mini.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_ssh-red.tmpl | 0 home/{dot_ssh => private_dot_ssh}/private_ssh-yellow.tmpl | 0 .../run_onchanges_after_ensure-private-key.tmpl | 0 .../run_onchanges_after_generate-public-keys.tmpl | 0 .../ssh-authorized_keys.yubikey.tmpl | 0 home/{dot_ssh => private_dot_ssh}/symlink_authorized_keys.tmpl | 0 home/{dot_ssh => private_dot_ssh}/system/banner | 0 .../system/run_onchange_after_sshd.tmpl | 0 home/{dot_ssh => private_dot_ssh}/system/sshd_config.tmpl | 0 28 files changed, 1 insertion(+), 1 deletion(-) rename home/{dot_gnupg => private_dot_gnupg}/public/0xF0A300E4199A1C33.sig (100%) rename home/{dot_gnupg => private_dot_gnupg}/public/apt.hashicorp.sig (100%) rename home/{dot_gnupg => private_dot_gnupg}/public/linux.wazuh.sig (100%) rename home/{dot_gnupg => private_dot_gnupg}/public/qubes.uman.sig (100%) rename home/{dot_ssh => private_dot_ssh}/authorized_keys.github.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/endlessh/config.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/endlessh/run_onchange_after_endlessh.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/fail2ban/jail.local.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/fail2ban/run_onchange_after_fail2ban.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_config.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_id_rsa.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_ssh-audi.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_ssh-blue.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_ssh-fiat.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_ssh-honda.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_ssh-lab.pub.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_ssh-lab.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_ssh-mini.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_ssh-red.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/private_ssh-yellow.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/run_onchanges_after_ensure-private-key.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/run_onchanges_after_generate-public-keys.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/ssh-authorized_keys.yubikey.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/symlink_authorized_keys.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/system/banner (100%) rename home/{dot_ssh => private_dot_ssh}/system/run_onchange_after_sshd.tmpl (100%) rename home/{dot_ssh => private_dot_ssh}/system/sshd_config.tmpl (100%) diff --git a/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl index 9791a76c..714b3c32 100644 --- a/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl @@ -20,7 +20,7 @@ if [ -n "$KEYID" ] && command -v gpg > /dev/null; then KEYID_TRIMMED="$(echo "$KEYID" | sed 's/^0x//')" if ! gpg --list-secret-keys --keyid-format=long | grep "$KEYID_TRIMMED" > /dev/null; then logg info 'Attempting to download the specified public GPG key (`{{ .user.gpg.id }}`) from public keyservers' - gpg --keyserver hkps://pgp.mit.edu --recv "$KEYID" || EXIT_CODE=$? + gpg --keyserver https://pgp.mit.edu --recv "$KEYID" || EXIT_CODE=$? if [ -n "$EXIT_CODE" ]; then logg warn 'Error downloading public GPG key' logg info 'Retrying after turning on debug mode and using the standard DNS resolver' diff --git a/home/dot_gnupg/public/0xF0A300E4199A1C33.sig b/home/private_dot_gnupg/public/0xF0A300E4199A1C33.sig similarity index 100% rename from home/dot_gnupg/public/0xF0A300E4199A1C33.sig rename to home/private_dot_gnupg/public/0xF0A300E4199A1C33.sig diff --git a/home/dot_gnupg/public/apt.hashicorp.sig b/home/private_dot_gnupg/public/apt.hashicorp.sig similarity index 100% rename from home/dot_gnupg/public/apt.hashicorp.sig rename to home/private_dot_gnupg/public/apt.hashicorp.sig diff --git a/home/dot_gnupg/public/linux.wazuh.sig b/home/private_dot_gnupg/public/linux.wazuh.sig similarity index 100% rename from home/dot_gnupg/public/linux.wazuh.sig rename to home/private_dot_gnupg/public/linux.wazuh.sig diff --git a/home/dot_gnupg/public/qubes.uman.sig b/home/private_dot_gnupg/public/qubes.uman.sig similarity index 100% rename from home/dot_gnupg/public/qubes.uman.sig rename to home/private_dot_gnupg/public/qubes.uman.sig diff --git a/home/dot_ssh/authorized_keys.github.tmpl b/home/private_dot_ssh/authorized_keys.github.tmpl similarity index 100% rename from home/dot_ssh/authorized_keys.github.tmpl rename to home/private_dot_ssh/authorized_keys.github.tmpl diff --git a/home/dot_ssh/endlessh/config.tmpl b/home/private_dot_ssh/endlessh/config.tmpl similarity index 100% rename from home/dot_ssh/endlessh/config.tmpl rename to home/private_dot_ssh/endlessh/config.tmpl diff --git a/home/dot_ssh/endlessh/run_onchange_after_endlessh.tmpl b/home/private_dot_ssh/endlessh/run_onchange_after_endlessh.tmpl similarity index 100% rename from home/dot_ssh/endlessh/run_onchange_after_endlessh.tmpl rename to home/private_dot_ssh/endlessh/run_onchange_after_endlessh.tmpl diff --git a/home/dot_ssh/fail2ban/jail.local.tmpl b/home/private_dot_ssh/fail2ban/jail.local.tmpl similarity index 100% rename from home/dot_ssh/fail2ban/jail.local.tmpl rename to home/private_dot_ssh/fail2ban/jail.local.tmpl diff --git a/home/dot_ssh/fail2ban/run_onchange_after_fail2ban.tmpl b/home/private_dot_ssh/fail2ban/run_onchange_after_fail2ban.tmpl similarity index 100% rename from home/dot_ssh/fail2ban/run_onchange_after_fail2ban.tmpl rename to home/private_dot_ssh/fail2ban/run_onchange_after_fail2ban.tmpl diff --git a/home/dot_ssh/private_config.tmpl b/home/private_dot_ssh/private_config.tmpl similarity index 100% rename from home/dot_ssh/private_config.tmpl rename to home/private_dot_ssh/private_config.tmpl diff --git a/home/dot_ssh/private_id_rsa.tmpl b/home/private_dot_ssh/private_id_rsa.tmpl similarity index 100% rename from home/dot_ssh/private_id_rsa.tmpl rename to home/private_dot_ssh/private_id_rsa.tmpl diff --git a/home/dot_ssh/private_ssh-audi.tmpl b/home/private_dot_ssh/private_ssh-audi.tmpl similarity index 100% rename from home/dot_ssh/private_ssh-audi.tmpl rename to home/private_dot_ssh/private_ssh-audi.tmpl diff --git a/home/dot_ssh/private_ssh-blue.tmpl b/home/private_dot_ssh/private_ssh-blue.tmpl similarity index 100% rename from home/dot_ssh/private_ssh-blue.tmpl rename to home/private_dot_ssh/private_ssh-blue.tmpl diff --git a/home/dot_ssh/private_ssh-fiat.tmpl b/home/private_dot_ssh/private_ssh-fiat.tmpl similarity index 100% rename from home/dot_ssh/private_ssh-fiat.tmpl rename to home/private_dot_ssh/private_ssh-fiat.tmpl diff --git a/home/dot_ssh/private_ssh-honda.tmpl b/home/private_dot_ssh/private_ssh-honda.tmpl similarity index 100% rename from home/dot_ssh/private_ssh-honda.tmpl rename to home/private_dot_ssh/private_ssh-honda.tmpl diff --git a/home/dot_ssh/private_ssh-lab.pub.tmpl b/home/private_dot_ssh/private_ssh-lab.pub.tmpl similarity index 100% rename from home/dot_ssh/private_ssh-lab.pub.tmpl rename to home/private_dot_ssh/private_ssh-lab.pub.tmpl diff --git a/home/dot_ssh/private_ssh-lab.tmpl b/home/private_dot_ssh/private_ssh-lab.tmpl similarity index 100% rename from home/dot_ssh/private_ssh-lab.tmpl rename to home/private_dot_ssh/private_ssh-lab.tmpl diff --git a/home/dot_ssh/private_ssh-mini.tmpl b/home/private_dot_ssh/private_ssh-mini.tmpl similarity index 100% rename from home/dot_ssh/private_ssh-mini.tmpl rename to home/private_dot_ssh/private_ssh-mini.tmpl diff --git a/home/dot_ssh/private_ssh-red.tmpl b/home/private_dot_ssh/private_ssh-red.tmpl similarity index 100% rename from home/dot_ssh/private_ssh-red.tmpl rename to home/private_dot_ssh/private_ssh-red.tmpl diff --git a/home/dot_ssh/private_ssh-yellow.tmpl b/home/private_dot_ssh/private_ssh-yellow.tmpl similarity index 100% rename from home/dot_ssh/private_ssh-yellow.tmpl rename to home/private_dot_ssh/private_ssh-yellow.tmpl diff --git a/home/dot_ssh/run_onchanges_after_ensure-private-key.tmpl b/home/private_dot_ssh/run_onchanges_after_ensure-private-key.tmpl similarity index 100% rename from home/dot_ssh/run_onchanges_after_ensure-private-key.tmpl rename to home/private_dot_ssh/run_onchanges_after_ensure-private-key.tmpl diff --git a/home/dot_ssh/run_onchanges_after_generate-public-keys.tmpl b/home/private_dot_ssh/run_onchanges_after_generate-public-keys.tmpl similarity index 100% rename from home/dot_ssh/run_onchanges_after_generate-public-keys.tmpl rename to home/private_dot_ssh/run_onchanges_after_generate-public-keys.tmpl diff --git a/home/dot_ssh/ssh-authorized_keys.yubikey.tmpl b/home/private_dot_ssh/ssh-authorized_keys.yubikey.tmpl similarity index 100% rename from home/dot_ssh/ssh-authorized_keys.yubikey.tmpl rename to home/private_dot_ssh/ssh-authorized_keys.yubikey.tmpl diff --git a/home/dot_ssh/symlink_authorized_keys.tmpl b/home/private_dot_ssh/symlink_authorized_keys.tmpl similarity index 100% rename from home/dot_ssh/symlink_authorized_keys.tmpl rename to home/private_dot_ssh/symlink_authorized_keys.tmpl diff --git a/home/dot_ssh/system/banner b/home/private_dot_ssh/system/banner similarity index 100% rename from home/dot_ssh/system/banner rename to home/private_dot_ssh/system/banner diff --git a/home/dot_ssh/system/run_onchange_after_sshd.tmpl b/home/private_dot_ssh/system/run_onchange_after_sshd.tmpl similarity index 100% rename from home/dot_ssh/system/run_onchange_after_sshd.tmpl rename to home/private_dot_ssh/system/run_onchange_after_sshd.tmpl diff --git a/home/dot_ssh/system/sshd_config.tmpl b/home/private_dot_ssh/system/sshd_config.tmpl similarity index 100% rename from home/dot_ssh/system/sshd_config.tmpl rename to home/private_dot_ssh/system/sshd_config.tmpl