Merge branch 'master' into commercial

bin/telebit-relay.js

@@ -134,7 +134,7 @@ function applyConfig(config) {
     // TODO specify extensions in config file
     state.extensions = require('../lib/extensions');
   } catch(e) {
-    if (state.debug) { console.log('[DEBUG] no extensions loaded', e); }
+    if ('ENOENT' !== e.code || state.debug) { console.log('[DEBUG] no extensions loaded', e); }
     state.extensions = {};
   }
   require('../lib/handlers').create(state); // adds directly to config for now...

examples/telebit-relay.yml

@@ -2,6 +2,8 @@ email: 'jon@example.com'       # must be valid (for certificate recovery and sec
 agree_tos: true                # agree to the Telebit, Greenlock, and Let's Encrypt TOSes
 community_member: true         # receive infrequent relevant updates
 telemetry: true                # contribute to project telemetric data
+webmin_domain: example.com
+shared_domain: xm.pl
 servernames:                   # hostnames that direct to the Telebit Relay admin console
   - telebit.example.com
   - telebit.example.net

lib/relay.js

@@ -264,7 +264,7 @@ module.exports.create = function (state) {
           //token.dynamicPorts.push(serviceport);
           Devices.add(state.deviceLists, serviceport, token);
           //var hri = require('human-readable-ids').hri;
-          //var hrname = hri.random() + '.telebit.cloud';
+          //var hrname = hri.random() + '.' + state.config.sharedDomain;
           //token.dynamicNames.push(hrname);
           // TODO restrict to authenticated device
           // TODO pull servername from config
@@ -275,8 +275,8 @@ module.exports.create = function (state) {
           , [ 2
             , 'grant'
             , [ ['ssh+https', token.domains[0], 443 ]
-              , ['ssh', 'ssh.telebit.cloud', serviceport ]
-              , ['tcp', 'tcp.telebit.cloud', serviceport]
+              , ['ssh', 'ssh.' + state.config.sharedDomain, serviceport ]
+              , ['tcp', 'tcp.' + state.config.sharedDomain, serviceport]
               , ['https', token.domains[0] ]
               ]
             ]