+2 -2

2configs/default.nix

View file Reviewed

··· 35 35 clanCore.secrets.password = { 36 36 secrets.password = { }; 37 37 secrets.passwordHash = { }; 38 38 - generator = '' 38 38 + generator.script = '' 39 39 ${pkgs.xkcdpass}/bin/xkcdpass -n 4 -d - > $secrets/password 40 40 cat $secrets/password | ${pkgs.mkpasswd}/bin/mkpasswd -s -m sha-512 > $secrets/passwordHash 41 41 ''; ··· 50 50 clanCore.secrets.ssh = { 51 51 secrets."ssh.id_ed25519" = { }; 52 52 facts."ssh.id_ed25519.pub" = { }; 53 53 - generator = '' 53 53 + generator.script = '' 54 54 ${pkgs.openssh}/bin/ssh-keygen -t ed25519 -N "" -f $secrets/ssh.id_ed25519 55 55 mv $secrets/ssh.id_ed25519.pub $facts/ssh.id_ed25519.pub 56 56 '';

+1 -1

2configs/retiolum.nix

View file Reviewed

··· 36 36 secrets."retiolum.ed25519_key.priv" = { }; 37 37 facts."retiolum.rsa_key.pub" = { }; 38 38 facts."retiolum.ed25519_key.pub" = { }; 39 39 - generator = '' 39 39 + generator.script = '' 40 40 ${pkgs.tinc_pre}/bin/tinc --config "$secrets" generate-keys 4096 >/dev/null 41 41 mv "$secrets"/rsa_key.priv "$secrets"/retiolum.rsa_key.priv 42 42 mv "$secrets"/ed25519_key.priv "$secrets"/retiolum.ed25519_key.priv

+1 -1

2configs/syncthing.nix

View file Reviewed

··· 41 41 secrets."syncthing.key" = { }; 42 42 secrets."syncthing.cert" = { }; 43 43 facts."syncthing.pub" = { }; 44 44 - generator = '' 44 44 + generator.script = '' 45 45 ${pkgs.syncthing}/bin/syncthing generate --config "$secrets" 46 46 mv "$secrets"/key.pem "$secrets"/syncthing.key 47 47 mv "$secrets"/cert.pem "$secrets"/syncthing.cert

+1 -1

2configs/tor-ssh.nix

View file Reviewed

··· 17 17 clanCore.secrets.tor-ssh = { 18 18 secrets."ssh-tor.priv" = { }; 19 19 secrets."tor-hostname" = { }; 20 20 - generator = '' 20 20 + generator.script = '' 21 21 ${pkgs.mkp224o}/bin/mkp224o-donna lass -n 1 -d . -q -O addr 22 22 mv "$(cat addr)"/hs_ed25519_secret_key "$secrets"/ssh-tor.priv 23 23 mv addr "$secrets"/tor-hostname