Commit Graph

240 Commits

Author SHA1 Message Date
AJ ONeal 9cd489f575 Merge branch 'master' into commercial 2018-06-21 20:00:11 +00:00
AJ ONeal af63322aca minor logging cleanup 2018-06-21 20:00:02 +00:00
AJ ONeal 5d065c8bd0 mark token as claimed if a socket already exists 2018-06-21 19:59:44 +00:00
AJ ONeal a9353a9a75 resolve promise on pair 2018-06-21 19:48:04 +00:00
AJ ONeal 06b894a99d remove excess logging 2018-06-21 19:38:03 +00:00
AJ ONeal d2fde5c38c better logging 2018-06-21 19:36:21 +00:00
AJ ONeal 4db9a8d53d clear error message 2018-06-21 11:19:10 +00:00
AJ ONeal 809c14f91f check status for complete and invalid 2018-06-21 11:02:53 +00:00
AJ ONeal 79648af88c check invalid and complete statuses 2018-06-21 06:23:16 +00:00
AJ ONeal 148cda8516 handle pairing request via API 2018-06-21 06:13:05 +00:00
AJ ONeal 179256a88e mo' betta' 2018-06-20 09:02:00 +00:00
AJ ONeal 95f9ca0844 Merge branch 'master' into c-accounts 2018-06-19 23:43:50 +00:00
AJ ONeal 8be76e1eb2 major refactor (only briefly tested) 2018-06-19 23:43:28 +00:00
AJ ONeal 33a565b19a add urequest 2018-06-19 23:41:41 +00:00
AJ ONeal 114cc53dd4 WIP api token for accounts 2018-06-19 23:40:58 +00:00
AJ ONeal cb8261fd31 add index.json 2018-06-15 22:53:30 +00:00
AJ ONeal 09b1d5939e so commercial 2018-06-15 22:50:32 +00:00
AJ ONeal 2603c322bd Merge branch 'commercial' of https://git.ppl.family/ppl/commercial.telebit-relay.js into commercial 2018-06-15 09:00:21 +00:00
AJ ONeal 96631d1369 nearly works again :) 2018-06-15 09:00:16 +00:00
AJ ONeal 8a1e2f14e0 Merge branch 'master' into commercial 2018-06-15 08:47:14 +00:00
AJ ONeal 92f37a515a Merge branch 'master' of ssh://git.coolaj86.com:22042/coolaj86/telebit-relay.js 2018-06-15 08:46:55 +00:00
AJ ONeal e619018276 show meaningful errors 2018-06-15 08:46:43 +00:00
AJ ONeal 0013930dbd updates 2018-06-15 08:45:47 +00:00
AJ ONeal 72986ccdc1 Merge branch 'master' into commercial 2018-06-15 06:13:43 +00:00
AJ ONeal c8c06d1b99 use sharedDomain from config 2018-06-15 06:13:26 +00:00
AJ ONeal ff52d1e4a8 Merge branch 'commercial' of https://git.ppl.family/ppl/commercial.telebit-relay.js into commercial 2018-06-15 06:10:15 +00:00
AJ ONeal c1c7dfba02 Merge branch 'master' into commercial 2018-06-15 06:10:06 +00:00
AJ ONeal 13a9e77998 Merge branch 'master' of ssh://git.coolaj86.com:22042/coolaj86/telebit-relay.js 2018-06-15 06:09:55 +00:00
AJ ONeal f94e01917e update example config 2018-06-15 06:09:46 +00:00
AJ ONeal d6f517ed2b Merge branch 'commercial' of https://git.ppl.family/ppl/commercial.telebit-relay.js into commercial 2018-06-15 05:17:11 +00:00
AJ ONeal f8ac7baa1a Merge branch 'master' into commercial 2018-06-15 05:16:58 +00:00
AJ ONeal 33c3bc9876 Merge branch 'master' of ssh://git.coolaj86.com:22042/coolaj86/telebit-relay.js 2018-06-15 05:16:46 +00:00
AJ ONeal f2cd8158f7 ignore node files 2018-06-15 05:16:23 +00:00
AJ ONeal f0df611886 fix ssh doc bug 2018-06-15 05:05:18 +00:00
AJ ONeal 02c3836883 change user permissions 2018-06-14 22:22:58 +00:00
AJ ONeal 6cfad96323 adduser telebit 2018-06-14 21:23:08 +00:00
AJ ONeal 24b42e1ed9 manual install instructions for linux 2018-06-14 21:21:48 +00:00
AJ ONeal f8c7517b14 Merge branch 'master' into commercial 2018-06-14 21:19:39 +00:00
AJ ONeal 39b01fca47 rename telebitd => telebit-relay 2018-06-14 21:19:27 +00:00
AJ ONeal f704a9fa19 Merge branch 'master' into commercial 2018-06-14 21:14:16 +00:00
AJ ONeal 4a3a395c14 de-hard-code TELEBIT_RELAY_PATH 2018-06-14 21:13:36 +00:00
AJ ONeal 7e83b0c3c2 whitespace 2018-06-14 21:13:09 +00:00
AJ ONeal 2e36d903ae de-hard-code TELEBIT_RELAY_PATH 2018-06-14 20:51:50 +00:00
AJ ONeal c8d974884b read from /dev/tty direct 2018-06-14 20:46:41 +00:00
AJ ONeal 93c864d4d4 read from /dev/tty direct 2018-06-14 20:45:51 +00:00
AJ ONeal 7de7cc651d update some stuff... 2018-06-14 20:43:57 +00:00
AJ ONeal d700b51494 don't assume the use of /etc 2018-06-14 14:40:43 -06:00
AJ ONeal 97e5a847b8 more output 2018-06-14 10:43:25 +00:00
AJ ONeal 20f59b6af7 Merge branch 'master' into commercial 2018-06-14 10:09:58 +00:00
AJ ONeal c70ba4f4fd fix bad new path 2018-06-14 10:05:19 +00:00