summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/external/default.nix4
-rw-r--r--lib/types.nix2
2 files changed, 4 insertions, 2 deletions
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 28d58b525..9b7ebf311 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -632,8 +632,10 @@ in {
};
hydrogen = {
owner = config.krebs.users.sandro;
- nets = {
+ nets = rec {
+ internet.addrs = [ "hydrogen.supersandro.de" ];
retiolum = {
+ via = internet;
ip4.addr = "10.243.54.54";
aliases = [ "hydrogen.r" ];
tinc.pubkey = ''
diff --git a/lib/types.nix b/lib/types.nix
index 6755eef03..b6c266c33 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -113,7 +113,7 @@ rec {
default = null;
};
addrs = mkOption {
- type = listOf addr;
+ type = listOf (either addr str);
default =
optional (config.ip4 != null) config.ip4.addr ++
optional (config.ip6 != null) config.ip6.addr;