From be37b4e5b3009e4b22876f39110213c191eb49ab Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 9 Oct 2017 13:54:56 +0200 Subject: [PATCH 1/4] ma tools/dev: add cdrtools --- makefu/2configs/tools/dev.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix index 6681484fd..d3d50c433 100644 --- a/makefu/2configs/tools/dev.nix +++ b/makefu/2configs/tools/dev.nix @@ -16,5 +16,6 @@ whatsupnix brain gen-oath-safe + cdrtools ]; } From 0652354ee674005a9e0f5477c1741fbaaa69999e Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 10 Oct 2017 00:04:14 +0200 Subject: [PATCH 2/4] ma latte.r: add torrent --- makefu/1systems/latte/config.nix | 1 + makefu/1systems/latte/source.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix index d532f216f..3b06660c6 100644 --- a/makefu/1systems/latte/config.nix +++ b/makefu/1systems/latte/config.nix @@ -26,6 +26,7 @@ in { # Services + ]; krebs = { diff --git a/makefu/1systems/latte/source.nix b/makefu/1systems/latte/source.nix index d997fb3f0..d9600909a 100644 --- a/makefu/1systems/latte/source.nix +++ b/makefu/1systems/latte/source.nix @@ -1,3 +1,4 @@ import { - name="latte"; + name = "latte"; + torrent = true; } From e41288cdc288ed4c2e54b0e9da629a1b888f6016 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 10 Oct 2017 22:11:12 +0200 Subject: [PATCH 3/4] ma wvdial: re-add --- makefu/3modules/wvdial.nix | 71 ++++++++++++++++++++++++++++++++++++++ makefu/source.nix | 3 +- 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 makefu/3modules/wvdial.nix 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 + /etc/wvdial.conf. + ''; + }; + + 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 = + "/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) From b9731d4851ec4f49235c0ea9e460bd96d2ff29a9 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 10 Oct 2017 22:11:32 +0200 Subject: [PATCH 4/4] ma cake.r: add tv --- makefu/1systems/cake/config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix index e8438e50d..c287c28df 100644 --- a/makefu/1systems/cake/config.nix +++ b/makefu/1systems/cake/config.nix @@ -6,6 +6,9 @@ # configure your hw: # ]; + users.extraUsers.root.openssh.authorizedKeys.keys = [ + config.krebs.users.tv.pubkey + ]; krebs = { enable = true; tinc.retiolum.enable = true;