1 files changed, 58 insertions, 29 deletions

diff --git a/webthings-gateway.conf b/webthings-gateway.conf
index 029c8fe70b9d..92c8a2fcf1ab 100644
--- a/webthings-gateway.conf
+++ b/webthings-gateway.conf
@@ -13,68 +13,97 @@ const path = require('path');
 const home = os.homedir();
 
 module.exports = {
-  // Expose CLI
-  cli: false,
-
+  // Base profile directory
   profileDir: `/etc/webthings-gateway`,
 
   ports: {
+    // HTTPS port
     https: 4443,
+
+    // HTTP port
     http: 8080,
+
+    // IPC port -- changing this will likely break all add-ons
     ipc: 9500,
   },
+
   // Whether the gateway is behind port forwarding and should use simplified
   // port-free urls
   behindForwarding: false,
+
   addonManager: {
+    // URLs of add-on lists to parse, in order
     listUrls: [
-      'https://api.mozilla-iot.org:8443/addons',
+      'https://api.webthings.io:8443/addons',
     ],
+
+    // Whether or not to allow installation of test-only add-ons
     testAddons: false,
   },
+
   database: {
+    // Remove the database before opening. Only useful for testing.
     removeBeforeOpen: false,
   },
+
   settings: {
     defaults: {
-      domain: {
-        localAccess: false,
-        mozillaTunnelService: true,
-        localControl: {
-          mdnsServiceType: 'http',
-          mdnsServiceName: 'Mozilla WebThings Gateway',
-          mdnsServiceDomain: os.hostname().split('.')[0],
-
-          mdnsTxt: {
-            desc: 'Web of Things Gateway',
-            protocol: 'http, https, Web Sockets',
-            power: '6 watts',
-          },
-        },
+      mdns: {
+        // Whether or not to enable mDNS advertisements
+        enabled: false,
+
+        // Domain to advertise via mDNS
+        domain: os.hostname().split('.')[0],
       },
     },
   },
-  authentication: {
-    defaultUser: null,
-  },
+
   ssltunnel: {
+    // Whether or not to enable the PageKite tunnel (if set up)
     enabled: true,
-    registration_endpoint: 'https://api.mozilla-iot.org:8443',
-    domain: 'mozilla-iot.org',
-    pagekite_cmd: '/usr/bin/pagekite',
+
+    // Endpoint of the PageKite server
+    registration_endpoint: 'https://api.webthings.io:8443',
+
+    // Base domain
+    domain: 'webthings.io',
+
+    // Command to run PageKite
+    pagekite_cmd: path.normalize(path.join(process.cwd(), 'pagekite.py')),
+
+    // Port the PageKite server is running on
     port: 443,
-    certemail: 'certificate@mozilla-iot.org',
+
+    // Email address to use during certificate generation
+    certemail: 'noreply@webthings.io',
+  },
+
+  updates: {
+    // URL of update server
+    url: 'https://api.webthings.io:8443/releases',
+
+    // Whether or not to allow prerelease updates
+    allowPrerelease: false,
   },
-  bcryptRounds: 2,
-  updateUrl: 'https://api.mozilla-iot.org:8443/releases',
+
   wifi: {
     ap: {
+      // IP address to run captive portal on
       ipaddr: '192.168.2.1',
+
+      // Base SSID to use for captive portal (suffix will include MAC address
+      // components)
       ssid_base: 'WebThings Gateway',
     },
   },
-  oauthPostToken: false,
-  oauthTestClients: false,
+
+  oauth: {
+    // Whether or not to post the OAuth token back in the response
+    postToken: false,
+
+    // Whether or not to allow test clients
+    testClients: false,
+  },
 };
 
 // vim:set ts=2 sw=2 et ft=javascript: