diff --git a/bin/skyg b/bin/skyg index 2d0e06a..8badbbc 100755 --- a/bin/skyg +++ b/bin/skyg @@ -115,3 +115,31 @@ def "main hm" [action: string@hm-actions, profile: string = "ari"] { def hm-actions [] { ["switch", "build"] } + +def secret-names [] { + ls secrets/*.age | get name | each { |f| $f | path basename | str replace ".age" "" } +} + +# Decrypt a secret from secrets/ folder +def "main decrypt" [secret: string@secret-names] { + let src = $"secrets/($secret).age" + if not ($src | path exists) { + error make { msg: $"Secret not found: ($src)" } + } + mkdir .tmp + let dest = $".tmp/unencrypted-($secret)" + age -d -i ~/.ssh/id_ed25519 $src | save -f $dest + print $"Decrypted to ($dest)" +} + +# Encrypt a file to secrets/ folder (re-encrypts using agenix) +def "main encrypt" [secret: string@secret-names, source?: string] { + let src = $source | default $".tmp/unencrypted-($secret)" + if not ($src | path exists) { + error make { msg: $"Source file not found: ($src)" } + } + let dest = $"secrets/($secret).age" + cp $src $dest + agenix -r -i ~/.ssh/id_ed25519 + print $"Encrypted ($dest)" +} diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 50ff0c6..90caa55 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -25,7 +25,7 @@ in skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; skyg.server.dns = { - enable = true; + enable = false; openFirewall = true; addressesSecretName = "dns-addresses.conf"; }; diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 384f021..a21d8cd 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -3,7 +3,7 @@ skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; skyg.server.dns = { - enable = true; + enable = false; openFirewall = true; addressesSecretName = "dns-addresses.conf"; }; diff --git a/hosts/hl-minipc3.nix b/hosts/hl-minipc3.nix index 3bfb71c..77ebcdb 100644 --- a/hosts/hl-minipc3.nix +++ b/hosts/hl-minipc3.nix @@ -4,7 +4,7 @@ skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; skyg.server.dns = { - enable = true; + enable = false; openFirewall = true; addressesSecretName = "dns-addresses.conf"; }; diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index 7d2730e..7331ac2 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -18,7 +18,7 @@ in skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; skyg.server.dns = { - enable = true; + enable = false; openFirewall = true; addressesSecretName = "dns-addresses.conf"; }; diff --git a/secrets/dns-addresses.conf.age b/secrets/dns-addresses.conf.age index 0aeb987..1865b1a 100644 Binary files a/secrets/dns-addresses.conf.age and b/secrets/dns-addresses.conf.age differ diff --git a/secrets/glmain.json.age b/secrets/glmain.json.age index d880458..824cea8 100644 Binary files a/secrets/glmain.json.age and b/secrets/glmain.json.age differ