palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reformat

Browse source
This commit is contained in:
Ingolf Wagner 2020-01-10 18:45:44 +13:00
parent da863a77ea
commit a69e393644
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
terranix/tinc-test/02-build/configs/nixserver-server/configuration.nix
View file

@ -10,7 +10,8 @@
to = 60100; to = 60100;
}]; }];
services.sshd.enable = true; services.sshd.enable = true;
users.users.root.openssh.authorizedKeys.keyFiles = [ <test-generated/sshkey.pub> ]; users.users.root.openssh.authorizedKeys.keyFiles =
[ <test-generated/sshkey.pub> ];
# wireshark # wireshark
programs.wireshark.enable = true; programs.wireshark.enable = true;

11
terranix/tinc-test/02-build/configs/nixserver-server/tinc.nix
View file

@ -1,12 +1,9 @@
# shared tinc file between client and server # shared tinc file between client and server
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let nixosMachines = import <test-generated/nixos-machines.nix>;
nixosMachines = import <test-generated/nixos-machines.nix>;
in { in {
imports = [ imports = [ <cluster-module> ];
<cluster-module>
];
networking.firewall.trustedInterfaces = [ "tinc.private" ]; networking.firewall.trustedInterfaces = [ "tinc.private" ];
@ -22,9 +19,7 @@ in {
hosts = { hosts = {
server = { server = {
tincIp = "10.123.142.1"; tincIp = "10.123.142.1";
realAddress = [ realAddress = [ nixosMachines.nixserver-server.host.ipv4 ];
nixosMachines.nixserver-server.host.ipv4
];
publicKey = lib.fileContents <test-assets/tinc/server_host_file>; publicKey = lib.fileContents <test-assets/tinc/server_host_file>;
}; };
sterni = { sterni = {