Merge remote-tracking branch 'ni/master'

3 files changed, 33 insertions, 46 deletions

diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 6c99f6bd2..14926fe3b 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -11,9 +11,9 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/gitrepos.nix>
     <stockholm/tv/2configs/mail-client.nix>
     <stockholm/tv/2configs/man.nix>
-    <stockholm/tv/2configs/netzclub.nix>
     <stockholm/tv/2configs/nginx/krebs-pages.nix>
     <stockholm/tv/2configs/nginx/public_html.nix>
+    <stockholm/tv/2configs/ppp.nix>
     <stockholm/tv/2configs/pulse.nix>
     <stockholm/tv/2configs/retiolum.nix>
     <stockholm/tv/2configs/binary-cache>
diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix
deleted file mode 100644
index dc2de7147..000000000
--- a/tv/2configs/netzclub.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ pkgs, ... }: {
-
-  # usage: ppp dial netzclub
-
-  environment.etc."ppp/peers/netzclub".text = ''
-    /dev/ttyACM2
-    921600
-    crtscts
-    defaultroute
-    holdoff 10
-    lock
-    maxfail 0
-    noauth
-    nodetach
-    noipdefault
-    passive
-    persist
-    usepeerdns
-    connect "${pkgs.ppp}/bin/chat -f ${pkgs.writeText "netzclub.script" ''
-      ABORT 'BUSY'
-      ABORT 'NO CARRIER'
-      ABORT 'VOICE'
-      ABORT 'NO DIALTONE'
-      ABORT 'NO DIAL TONE'
-      ABORT 'NO ANSWER'
-      ABORT 'DELAYED'
-      REPORT CONNECT
-      TIMEOUT 6
-      ''' 'ATQ0'
-      'OK-AT-OK' 'ATZ'
-      TIMEOUT 3
-      'OK\d-AT-OK' 'ATI'
-      'OK' 'ATZ'
-      'OK' 'ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0'
-      'OK' 'ATDT*99***1#'
-      TIMEOUT 30
-      CONNECT '''
-    ''}
-  '';
-
-  environment.systemPackages = [
-    pkgs.ppp
-  ];
-
-}
diff --git a/tv/2configs/ppp.nix b/tv/2configs/ppp.nix
new file mode 100644
index 000000000..9cc7568a5
--- /dev/null
+++ b/tv/2configs/ppp.nix
@@ -0,0 +1,32 @@
+{ pkgs, ... }: {
+
+  # usage: pppd call default
+
+  environment.etc."ppp/peers/default".text = ''
+    /dev/ttyACM2
+    921600
+    crtscts
+    defaultroute
+    holdoff 10
+    lock
+    maxfail 0
+    noauth
+    nodetach
+    noipdefault
+    passive
+    persist
+    usepeerdns
+    connect "${pkgs.ppp}/bin/chat -f ${pkgs.writeText "default.chat" ''
+      ABORT "BUSY"
+      ABORT "NO CARRIER"
+      REPORT CONNECT
+      "" "ATDT*99#"
+      CONNECT
+    ''}"
+  '';
+
+  environment.systemPackages = [
+    pkgs.ppp
+  ];
+
+}