summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-07-07 23:02:41 +0200
committertv <tv@krebsco.de>2016-07-07 23:02:41 +0200
commitf18ababed59c21615d6659881a01597e18e706d3 (patch)
treee379f438eb190ed76d8d4d4c28ee1adbd8ce2bb7 /lass/2configs
parent0c72da81cc58dcb68ae079901fae464249e5cec3 (diff)
parent8b829fdfa1e90635b1681ec9f466fcdc5d6e8f7e (diff)
Merge remote-tracking branch 'prism/lassulus'
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/default.nix2
-rw-r--r--lass/2configs/umts.nix62
2 files changed, 1 insertions, 63 deletions
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 377554514..e3065ba84 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -66,7 +66,7 @@ with config.krebs.lib;
};
};
- nix.useSandbox = true;
+ nix.useChroot = true;
users.mutableUsers = false;
diff --git a/lass/2configs/umts.nix b/lass/2configs/umts.nix
deleted file mode 100644
index c1fce9ea2..000000000
--- a/lass/2configs/umts.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with config.krebs.lib;
-
-let
- nixpkgs-1509 = import (pkgs.fetchFromGitHub {
- owner = "NixOS"; repo = "nixpkgs-channels";
- rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
- sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
- }) {};
-
- wvdial = nixpkgs-1509.wvdial; # https://github.com/NixOS/nixpkgs/issues/16113
-
- modem-device = "/dev/serial/by-id/usb-Lenovo_F5521gw_38214921FBBBC7B0-if09";
-
- # TODO: currently it is only netzclub
- umts-bin = pkgs.writeScriptBin "umts" ''
- #!/bin/sh
- set -euf
- systemctl stop wpa_supplicant
- systemctl start umts
- trap "systemctl stop umts && systemctl start wpa_supplicant;trap - INT TERM EXIT;exit" INT TERM EXIT
- echo nameserver 8.8.8.8 | tee -a /etc/resolv.conf
- journalctl -xfu umts
- '';
-
- wvdial-defaults = ''
- Modem = ${modem-device}
- Init1 = AT+CFUN=1
- Init2 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0
- Baud = 460800
- phone= *99#
- Username = netzclub
- Password = netzclub
- Stupid Mode = 1
- Idle Seconds = 0
- '';
-
-
- out = {
- environment.shellAliases = {
- umts = "sudo ${umts-bin}/bin/umts";
- };
-
- security.sudo.extraConfig = ''
- lass ALL= (root) NOPASSWD: ${umts-bin}/bin/umts
- '';
-
- environment.wvdial.dialerDefaults = wvdial-defaults;
-
- systemd.services.umts = {
- description = "UMTS wvdial Service";
- serviceConfig = {
- Type = "simple";
- Restart = "always";
- RestartSec = "10s";
- ExecStart = "${wvdial}/bin/wvdial -n";
- };
- };
- };
-in out
-