summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-10-10 22:11:12 +0200
committermakefu <github@syntax-fehler.de>2017-10-10 22:11:12 +0200
commite41288cdc288ed4c2e54b0e9da629a1b888f6016 (patch)
tree02dabce85c1af0d96cec00da97f7ab4a34bfa334
parent0652354ee674005a9e0f5477c1741fbaaa69999e (diff)
ma wvdial: re-add
-rw-r--r--makefu/3modules/wvdial.nix71
-rw-r--r--makefu/source.nix3
2 files changed, 72 insertions, 2 deletions
diff --git a/makefu/3modules/wvdial.nix b/makefu/3modules/wvdial.nix
new file mode 100644
index 000000000..1ed929ed4
--- /dev/null
+++ b/makefu/3modules/wvdial.nix
@@ -0,0 +1,71 @@
+# Global configuration for wvdial.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ configFile = ''
+ [Dialer Defaults]
+ PPPD PATH = ${pkgs.ppp}/sbin/pppd
+ ${config.environment.wvdial.dialerDefaults}
+ '';
+
+ cfg = config.environment.wvdial;
+
+in
+{
+ ###### interface
+
+ options = {
+
+ environment.wvdial = {
+
+ dialerDefaults = mkOption {
+ default = "";
+ type = types.str;
+ example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"'';
+ description = ''
+ Contents of the "Dialer Defaults" section of
+ <filename>/etc/wvdial.conf</filename>.
+ '';
+ };
+
+ pppDefaults = mkOption {
+ default = ''
+ noipdefault
+ usepeerdns
+ defaultroute
+ persist
+ noauth
+ '';
+ type = types.str;
+ description = "Default ppp settings for wvdial.";
+ };
+
+ };
+
+ };
+
+ ###### implementation
+
+ config = mkIf (cfg.dialerDefaults != "") {
+
+ environment = {
+
+ etc =
+ [
+ { source = pkgs.writeText "wvdial.conf" configFile;
+ target = "wvdial.conf";
+ }
+ { source = pkgs.writeText "wvdial" cfg.pppDefaults;
+ target = "ppp/peers/wvdial";
+ }
+ ];
+
+ };
+
+ };
+
+}
diff --git a/makefu/source.nix b/makefu/source.nix
index 013426195..8c880a8e2 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -11,8 +11,7 @@ let
then "buildbot"
else "makefu";
_file = <stockholm> + "/makefu/1systems/${name}/source.nix";
- ref = "727a3a3"; # unstable @ 2017-10-07
- # + revert wvdial (76f4910)
+ ref = "809cf38"; # unstable @ 2017-10-07
# + ruby stuff (2f0b17e4be9,55a952be5b5)
# + mitmproxy fix (360a5efd,ef52c95b)