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

tinc-test: clean sterni from tinc.test

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

10
configs/sterni/tinc.nix
View file

@ -4,21 +4,13 @@ with lib;
{ {
imports = [
<test-config/nixserver-server/tinc.nix>
];
module.cluster.services.tinc = { module.cluster.services.tinc = {
"private" = { "private" = {
enable = false; enable = true;
openPort = true; openPort = true;
connectTo = [ "sputnik" ]; connectTo = [ "sputnik" ];
}; };
"retiolum" = { "retiolum" = {
enable = false;
openPort = true;
};
"test" = {
enable = true; enable = true;
openPort = true; openPort = true;
}; };

7
shell.nix
View file

@ -71,11 +71,6 @@ let
pkgs.file = toString ./pkgs; pkgs.file = toString ./pkgs;
assets.file = toString ./assets; assets.file = toString ./assets;
# test-tinc
test-assets.file = toString ./terranix/tinc-test/02-build/assets;
test-config.file = toString ./terranix/tinc-test/02-build/configs;
test-generated.file = toString ./terranix/tinc-test/02-build/generated;
nix-writers.git = { nix-writers.git = {
url = "https://cgit.krebsco.de/nix-writers/"; url = "https://cgit.krebsco.de/nix-writers/";
ref = (ops.importJson ./.nix-writers.json).rev; ref = (ops.importJson ./.nix-writers.json).rev;
@ -122,7 +117,7 @@ let
}; };
hostPattern = name: "localhost"; hostPattern = name: "${name}.private";
serverDeployment = name: serverDeployment = name:
{ host ? (hostPattern name), user ? "root" }: { host ? (hostPattern name), user ? "root" }: