summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-04-09 00:49:56 +0200
committerlassulus <lass@aidsballs.de>2016-04-09 00:49:56 +0200
commite57841421bbb818572145dfec3dce12bf40017b4 (patch)
tree329c116cccc0e10bb6bcc74331933171bf195f12 /lass
parent5268f22ee99672a2185b959231208a23fd24f073 (diff)
parent345efd36833fc0ada2805b46fd71bcc9642f4374 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/cloudkrebs.nix3
-rw-r--r--lass/1systems/echelon.nix3
-rw-r--r--lass/1systems/prism.nix4
-rw-r--r--lass/2configs/privoxy-retiolum.nix3
-rw-r--r--lass/3modules/static_nginx.nix2
5 files changed, 5 insertions, 10 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index fb949ce33..636d6a855 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -2,9 +2,8 @@
let
inherit (import ../4lib { inherit pkgs lib; }) getDefaultGateway;
- inherit (lib) head;
- ip = (head config.krebs.build.host.nets.internet.addrs4);
+ ip = config.krebs.build.host.nets.internet.ip4.addr;
in {
imports = [
../.
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 2ff6dba70..80611ee80 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -2,9 +2,8 @@
let
inherit (import ../4lib { inherit pkgs lib; }) getDefaultGateway;
- inherit (lib) head;
- ip = (head config.krebs.build.host.nets.internet.addrs4);
+ ip = config.krebs.build.host.nets.internet.ip4.addr;
in {
imports = [
../.
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 4f6770c38..80dd8c4e9 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -1,9 +1,7 @@
{ config, lib, pkgs, ... }:
let
- inherit (lib) head;
-
- ip = (head config.krebs.build.host.nets.internet.addrs4);
+ ip = config.krebs.build.host.nets.internet.ip4.addr;
in {
imports = [
../.
diff --git a/lass/2configs/privoxy-retiolum.nix b/lass/2configs/privoxy-retiolum.nix
index 3a3641ad8..9059bbac8 100644
--- a/lass/2configs/privoxy-retiolum.nix
+++ b/lass/2configs/privoxy-retiolum.nix
@@ -1,8 +1,7 @@
{ config, lib, ... }:
let
- r_ip = (head config.krebs.build.host.nets.retiolum.addrs4);
- inherit (lib) head;
+ r_ip = config.krebs.build.host.nets.retiolum.ip4.addr;
in {
imports = [
diff --git a/lass/3modules/static_nginx.nix b/lass/3modules/static_nginx.nix
index 6e87e9853..6b5d19615 100644
--- a/lass/3modules/static_nginx.nix
+++ b/lass/3modules/static_nginx.nix
@@ -54,7 +54,7 @@ let
user = config.services.nginx.user;
group = config.services.nginx.group;
- external-ip = head config.krebs.build.host.nets.internet.addrs4;
+ external-ip = config.krebs.build.host.nets.internet.ip4.addr;
imp = {
krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ssl, ... }: {