From f5e177b5279bbdbbb78e68bc961dc475ad8b6a1e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 1 Oct 2016 02:13:47 +0200 Subject: l 1 mors: add iodine to pkgs --- lass/1systems/mors.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 1aa4d9b23..c3c7f6b59 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -194,6 +194,7 @@ with config.krebs.lib; remmina logf + iodine ]; #TODO: fix this shit -- cgit v1.2.3 From fbadb5cd59158305a2358e2a240f2fda6666894c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 1 Oct 2016 02:16:47 +0200 Subject: l 2 iodined: add -c to running command --- lass/2configs/iodined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/iodined.nix b/lass/2configs/iodined.nix index 3108a6b23..a02dab97c 100644 --- a/lass/2configs/iodined.nix +++ b/lass/2configs/iodined.nix @@ -10,7 +10,7 @@ in { enable = true; domain = domain; ip = "172.16.10.1/24"; - extraConfig = "-P ${pw} -l ${config.krebs.build.host.nets.internet.ip4.addr}"; + extraConfig = "-c -P ${pw} -l ${config.krebs.build.host.nets.internet.ip4.addr}"; }; krebs.iptables.tables.filter.INPUT.rules = [ -- cgit v1.2.3 From 8c618dd3f0e282a4b9235c66202b05dccff158d3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 1 Oct 2016 02:17:17 +0200 Subject: l 2 iodined: open the correct port --- lass/2configs/iodined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/iodined.nix b/lass/2configs/iodined.nix index a02dab97c..ff254f39d 100644 --- a/lass/2configs/iodined.nix +++ b/lass/2configs/iodined.nix @@ -14,7 +14,7 @@ in { }; krebs.iptables.tables.filter.INPUT.rules = [ - { predicate = "-p udp --dport 54"; target = "ACCEPT";} + { predicate = "-p udp --dport 53"; target = "ACCEPT";} ]; } -- cgit v1.2.3 From 836f1d3277e97945d0029c7458ab548eb41722dd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 1 Oct 2016 02:51:26 +0200 Subject: l 2 nixpkgs: 3fb009d -> 8a89481 --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 9e3fe888c..879da19bb 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/lassulus/nixpkgs; - ref = "3fb009d94e70f5d1151f4ec239a90d2de1979a74"; + ref = "8a8948167324f67d26a1c7ddc8e387128332b622"; }; } -- cgit v1.2.3 From 63ef87433085f10a874146bdeffb38abf17ea39f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 1 Oct 2016 02:52:35 +0200 Subject: l 3 umts: remove obsolete comments --- lass/3modules/umts.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lass') diff --git a/lass/3modules/umts.nix b/lass/3modules/umts.nix index 01adc0409..7daaba89e 100644 --- a/lass/3modules/umts.nix +++ b/lass/3modules/umts.nix @@ -41,10 +41,6 @@ let wvdial = nixpkgs-1509.wvdial; # https://github.com/NixOS/nixpkgs/issues/16113 - #modem-device = "/dev/serial/by-id/usb-Lenovo_F5521gw_38214921FBBBC7B0-if09"; - modem-device = "/dev/serial/by-id/usb-HUAWEI_Technologies_HUAWEI_Mobile-if00-port0"; - - # TODO: currently it is only netzclub umts-bin = pkgs.writeScriptBin "umts" '' #!/bin/sh set -euf -- cgit v1.2.3 From 4d7df5a4ee8cfa3fd1524b9442fefa3b0e3aebe7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 2 Oct 2016 12:38:04 +0200 Subject: l 1 mors: add macchanger to pkgs --- lass/1systems/mors.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index c3c7f6b59..21e992a3e 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -195,6 +195,8 @@ with config.krebs.lib; logf iodine + + macchanger ]; #TODO: fix this shit -- cgit v1.2.3