From d5c6e52dd5793a7cb0fad3835a5d1ab014c5bcc1 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 20:41:47 +0200 Subject: tv netzclub: init --- tv/2configs/netzclub.nix | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 tv/2configs/netzclub.nix (limited to 'tv/2configs') diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix new file mode 100644 index 000000000..659e0d4e4 --- /dev/null +++ b/tv/2configs/netzclub.nix @@ -0,0 +1,45 @@ +{ 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 = [ + ppp + ]; + +} -- cgit v1.2.3 From 42f3a5661b4e53b76eb7315df1782b9942f47865 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 21:10:36 +0200 Subject: tv netzclub: { -> pkgs.}ppp --- tv/2configs/netzclub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix index 659e0d4e4..dc2de7147 100644 --- a/tv/2configs/netzclub.nix +++ b/tv/2configs/netzclub.nix @@ -39,7 +39,7 @@ ''; environment.systemPackages = [ - ppp + pkgs.ppp ]; } -- cgit v1.2.3 From d19f415bb00368970f8e0a1548b89a472a24d634 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 21:29:35 +0200 Subject: tv netzclub: fix example --- tv/2configs/netzclub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix index dc2de7147..6e06005e3 100644 --- a/tv/2configs/netzclub.nix +++ b/tv/2configs/netzclub.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - # usage: ppp dial netzclub + # usage: pppd call netzclub environment.etc."ppp/peers/netzclub".text = '' /dev/ttyACM2 -- cgit v1.2.3 From f645e07f719e4529373674b8e47e18cb454f125f Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 22:57:51 +0200 Subject: tv netzclub: add missing " --- tv/2configs/netzclub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix index 6e06005e3..c49498ed4 100644 --- a/tv/2configs/netzclub.nix +++ b/tv/2configs/netzclub.nix @@ -35,7 +35,7 @@ 'OK' 'ATDT*99***1#' TIMEOUT 30 CONNECT ''' - ''} + ''}" ''; environment.systemPackages = [ -- cgit v1.2.3 From 6c8acbdf9ab464f09d2c08751528d31a81612351 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 27 Oct 2017 00:09:03 +0200 Subject: tv netzclub: simplify AT code --- tv/2configs/netzclub.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix index c49498ed4..7286bc84d 100644 --- a/tv/2configs/netzclub.nix +++ b/tv/2configs/netzclub.nix @@ -25,16 +25,8 @@ 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 ''' + "" "ATDT*99#" + CONNECT "" ''}" ''; -- cgit v1.2.3 From 36c01359dcffd3c7424366b9c43eb0b8baae666a Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 27 Oct 2017 01:35:04 +0200 Subject: tv: netzclub -> ppp --- tv/2configs/netzclub.nix | 37 ------------------------------------- tv/2configs/ppp.nix | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 37 deletions(-) delete mode 100644 tv/2configs/netzclub.nix create mode 100644 tv/2configs/ppp.nix (limited to 'tv/2configs') diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix deleted file mode 100644 index 7286bc84d..000000000 --- a/tv/2configs/netzclub.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ pkgs, ... }: { - - # usage: pppd call 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 - "" "ATDT*99#" - 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 + ]; + +} -- cgit v1.2.3