diff --git a/flake.nix b/flake.nix index c01b4c5..e0d9d2a 100644 --- a/flake.nix +++ b/flake.nix @@ -256,15 +256,13 @@ ./hosts/fra1-b/configuration.nix ./modules - #{ - # age.secrets = { - # zfs-passphrase-vno1-oh2.file = ./secrets/vno1-oh2/zfs-passphrase.age; - # borgbackup-password.file = ./secrets/fra1-a/borgbackup-password.age; - # motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age; - # root-passwd-hash.file = ./secrets/root_passwd_hash.age; - # sasl-passwd.file = ./secrets/postfix_sasl_passwd.age; - # }; - #} + { + age.secrets = { + motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age; + root-passwd-hash.file = ./secrets/root_passwd_hash.age; + sasl-passwd.file = ./secrets/postfix_sasl_passwd.age; + }; + } ]; specialArgs = { @@ -354,6 +352,17 @@ }; }; }; + + fra1-b = { + hostname = myData.hosts."fra1-b.servers.jakst".jakstIP; + profiles = { + system = { + sshUser = "motiejus"; + path = self.nixosConfigurations.fra1-b.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.fra1-b; + user = "root"; + }; + }; + }; }; checks = builtins.mapAttrs ( diff --git a/hosts/fra1-b/configuration.nix b/hosts/fra1-b/configuration.nix index 07dfdab..ab37ebf 100644 --- a/hosts/fra1-b/configuration.nix +++ b/hosts/fra1-b/configuration.nix @@ -46,10 +46,8 @@ in base = { users = { enable = true; - root.initialPassword = "live"; - user.initialPassword = "live"; - #root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path; - #user.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path; + root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path; + user.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path; }; unitstatus = {