From da863a77ea7887a3c1c46ee399a658a9c12f9ef7 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Wed, 8 Jan 2020 14:37:15 +1300
Subject: [PATCH] tinc-test: clean sterni from tinc.test

---
 configs/sterni/tinc.nix | 10 +---------
 shell.nix               |  7 +------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/configs/sterni/tinc.nix b/configs/sterni/tinc.nix
index e484fd4..7e998e7 100644
--- a/configs/sterni/tinc.nix
+++ b/configs/sterni/tinc.nix
@@ -4,21 +4,13 @@ with lib;
 
 {
 
-  imports = [
-    <test-config/nixserver-server/tinc.nix>
-  ];
-
   module.cluster.services.tinc = {
     "private" = {
-      enable = false;
+      enable = true;
       openPort = true;
       connectTo = [ "sputnik" ];
     };
     "retiolum" = {
-      enable = false;
-      openPort = true;
-    };
-    "test" = {
       enable = true;
       openPort = true;
     };
diff --git a/shell.nix b/shell.nix
index 5b7fcd3..2c45f35 100644
--- a/shell.nix
+++ b/shell.nix
@@ -71,11 +71,6 @@ let
       pkgs.file = toString ./pkgs;
       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 = {
         url = "https://cgit.krebsco.de/nix-writers/";
         ref = (ops.importJson ./.nix-writers.json).rev;
@@ -122,7 +117,7 @@ let
 
   };
 
-  hostPattern = name: "localhost";
+  hostPattern = name: "${name}.private";
 
   serverDeployment = name:
     { host ? (hostPattern name), user ? "root" }: