From 730e490e678c3f14f2a7c2dee70ff3749e835f42 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 2 Jul 2020 22:03:06 +0200 Subject: [PATCH] Fix paths --- common/secret/default.nix | Bin 16260 -> 16262 bytes nixos/machines/apollo/configuration.nix | 8 ++++---- nixos/machines/hera/configuration.nix | 8 ++++---- nixos/machines/hera/network.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/secret/default.nix b/common/secret/default.nix index b6e0ff59a6cf179f7c70b3e74ec65da83b7d3e2a..0e554a53a991e31aafb2386030d32b60beaa500e 100644 GIT binary patch literal 16262 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 literal 16260 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 diff --git a/nixos/machines/apollo/configuration.nix b/nixos/machines/apollo/configuration.nix index 36369c72..e261301e 100644 --- a/nixos/machines/apollo/configuration.nix +++ b/nixos/machines/apollo/configuration.nix @@ -28,7 +28,7 @@ in { m0wire = { allowedIPsAsRoutes = false; ips = [ "${hosts.apollo-wg}/112" ]; - privateKeyFile = "/etc/nixosnixos/machinesapollo/secret/wireguard-private"; + privateKeyFile = "/etc/nixos/nixos/machines/apollo/secret/wireguard-private"; peers = [{ publicKey = wireguard.pub.hera; allowedIPs = [ "::/0" ]; @@ -77,8 +77,8 @@ in { openDefaultPorts = true; declarative = syncthing.declarativeWith [ "hera" ] "/home/maralorn/media" // { - cert = "/etc/nixosnixos/machinesapollo/secret/syncthing/cert.pem"; - key = "/etc/nixosnixos/machinesapollo/secret/syncthing/key.pem"; + cert = "/etc/nixos/nixos/machines/apollo/secret/syncthing/cert.pem"; + key = "/etc/nixos/nixos/machines/apollo/secret/syncthing/key.pem"; }; }; gnome3.chrome-gnome-shell.enable = true; @@ -93,7 +93,7 @@ in { cdark_net = { enable = true; hostName = "${me.user}_${config.networking.hostName}"; - ed25519PrivateKeyFile = /etc/nixos/hosts + "/${config.networking.hostName}" + ed25519PrivateKeyFile = /etc/nixos/nixos/machines + "/${config.networking.hostName}" + /secret/tinc/ed25519_key.priv; hostsDirectory = (builtins.fetchGit "ssh://git@git.darmstadt.ccc.de/cdark.net/hosts"); diff --git a/nixos/machines/hera/configuration.nix b/nixos/machines/hera/configuration.nix index 0f0e280c..63cc7caa 100644 --- a/nixos/machines/hera/configuration.nix +++ b/nixos/machines/hera/configuration.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: # You need pw-files for every configured user in ./secret/pw-useralias for login to work. -# dropbearkey -t rsa -f /etc/nixosnixos/machines/secret/boot_rsa +# dropbearkey -t rsa -f /etc/nixos/nixos/machines//secret/boot_rsa let inherit (config.m-0.private) me; @@ -103,8 +103,8 @@ in { user = "maralorn"; openDefaultPorts = true; declarative = syncthing.declarativeWith [ "apollo" ] "/media" // { - cert = "/etc/nixosnixos/machineshera/secret/syncthing/cert.pem"; - key = "/etc/nixosnixos/machineshera/secret/syncthing/key.pem"; + cert = "/etc/nixos/nixos/machines/hera/secret/syncthing/cert.pem"; + key = "/etc/nixos/nixos/machines/hera/secret/syncthing/key.pem"; }; }; }; @@ -117,7 +117,7 @@ in { isNormalUser = true; uid = 1001; extraGroups = [ "wheel" "systemd-journal" ]; - passwordFile = "/etc/nixosnixos/machineshera/secret/pw-choreutes"; + passwordFile = "/etc/nixos/nixos/machines/hera/secret/pw-choreutes"; }; # This value determines the NixOS release with which your system is to be diff --git a/nixos/machines/hera/network.nix b/nixos/machines/hera/network.nix index 35ae6836..aa08d69f 100644 --- a/nixos/machines/hera/network.nix +++ b/nixos/machines/hera/network.nix @@ -54,7 +54,7 @@ in { wireguard.interfaces = { m0wire = { ips = [ "${hosts.hera-wg}/112" ]; - privateKeyFile = "/etc/nixosnixos/machineshera/secret/wireguard-private"; + privateKeyFile = "/etc/nixos/nixos/machines/hera/secret/wireguard-private"; listenPort = wireguard.port; peers = [{ publicKey = wireguard.pub.apollo;