diff options
| author | lassulus <lass@aidsballs.de> | 2016-10-11 17:54:00 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-10-11 17:54:00 +0200 |
| commit | 798f90c0fd8931ef114f7c7db32daa9f15824733 (patch) | |
| tree | e241892be8c85d05d297f11a5d312d41e2cb8f66 /lass | |
| parent | b6c5994e037ab92055f5cfdeb89f46864b348b39 (diff) | |
| parent | fa5816431ce0314b1c3260c763a87922b0ad485b (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/mors.nix | 3 | ||||
| -rw-r--r-- | lass/2configs/iodined.nix | 4 | ||||
| -rw-r--r-- | lass/3modules/umts.nix | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 87f83efa3..145e94921 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -200,6 +200,9 @@ with config.krebs.lib; thunderbird logf + iodine + + macchanger ]; #TODO: fix this shit diff --git a/lass/2configs/iodined.nix b/lass/2configs/iodined.nix index 52f6e9b87..f67e2ae86 100644 --- a/lass/2configs/iodined.nix +++ b/lass/2configs/iodined.nix @@ -10,11 +10,11 @@ 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 = [ - { predicate = "-p udp --dport 54"; target = "ACCEPT";} + { predicate = "-p udp --dport 53"; target = "ACCEPT";} ]; } 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 |