Merge remote-tracking branch 'cd/master'

2 files changed, 5 insertions, 12 deletions

diff --git a/makefu/3modules/snapraid.nix b/makefu/3modules/snapraid.nix
index fbdf50219..3d458bbbf 100644
--- a/makefu/3modules/snapraid.nix
+++ b/makefu/3modules/snapraid.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   # returns dirname without / , used as disk name
@@ -28,7 +28,7 @@ let
 
   out = {
     options.makefu.snapraid = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {
diff --git a/makefu/3modules/umts.nix b/makefu/3modules/umts.nix
index d7be45f62..e527a5cb7 100644
--- a/makefu/3modules/umts.nix
+++ b/makefu/3modules/umts.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   # TODO: currently it is only netzclub
@@ -32,7 +32,7 @@ let
 
   out = {
     options.makefu.umts = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {
@@ -56,19 +56,12 @@ let
 
     environment.wvdial.dialerDefaults = wvdial-defaults;
 
-    systemd.targets.network-umts = {
-      description = "System is running on UMTS";
-      unitConfig.StopWhenUnneeded = true;
-    };
-
     systemd.services.umts = {
       description = "UMTS wvdial Service";
-      before = [ "network-umts.target" ];
-
       serviceConfig = {
         Type = "simple";
         Restart = "always";
-        RestartSec = "4s";
+        RestartSec = "10s";
         ExecStart = "${pkgs.wvdial}/bin/wvdial -n";
       };
     };