summaryrefslogtreecommitdiffstats
path: root/lass/3modules
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-09-04 09:05:06 +0200
committermakefu <github@syntax-fehler.de>2017-09-04 09:05:06 +0200
commit729549d15464e57e41fd143450c36274cedc84fa (patch)
treec28cfa3576c601f7f665cebc7721ef3a08311792 /lass/3modules
parent848acb85ccecbe25987bf6da45a96fc4eaaa74e9 (diff)
parentfcf59a00e2ab675cb171cbe4f21b8df73836d144 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/3modules')
-rw-r--r--lass/3modules/hosts.nix2
-rw-r--r--lass/3modules/umts.nix21
2 files changed, 21 insertions, 2 deletions
diff --git a/lass/3modules/hosts.nix b/lass/3modules/hosts.nix
index 7e3af10be..37cbf3ed3 100644
--- a/lass/3modules/hosts.nix
+++ b/lass/3modules/hosts.nix
@@ -6,7 +6,7 @@ with import <stockholm/lib>;
options.lass.hosts = mkOption {
type = types.attrsOf types.host;
default =
- filterAttrs (_: host: host.owner.name == "lass" && host.managed)
+ filterAttrs (_: host: host.owner.name == "lass" && host.ci)
config.krebs.hosts;
};
}
diff --git a/lass/3modules/umts.nix b/lass/3modules/umts.nix
index 83de4d403..c93c65ad2 100644
--- a/lass/3modules/umts.nix
+++ b/lass/3modules/umts.nix
@@ -31,6 +31,16 @@ let
type = types.str;
default = "default";
};
+ pppDefaults = mkOption {
+ type = types.str;
+ default = ''
+ noipdefault
+ usepeerdns
+ defaultroute
+ persist
+ noauth
+ '';
+ };
};
nixpkgs-1509 = import (pkgs.fetchFromGitHub {
@@ -71,7 +81,16 @@ let
lass ALL= (root) NOPASSWD: ${umts-bin}/bin/umts
'';
- environment.wvdial.dialerDefaults = wvdial-defaults;
+ environment.etc = [
+ {
+ source = pkgs.writeText "wvdial.conf" wvdial-defaults;
+ target = "wvdial.conf";
+ }
+ {
+ source = pkgs.writeText "wvdial" cfg.pppDefaults;
+ target = "ppp/peers/wvdial";
+ }
+ ];
systemd.services.umts = {
description = "UMTS wvdial Service";