From 0103ae02d4cdcc43cf5a1171c0162d1c72dd62be Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Sat, 4 Mar 2017 00:25:20 -0700 Subject: [PATCH] retrieve ips, show priorities --- admin/public/index.html | 32 +++++++++++++++++++++++++------- bin/goldilocks.js | 5 +++-- packages/assets/org.oauth3 | 2 +- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/admin/public/index.html b/admin/public/index.html index 6896842..32872e2 100644 --- a/admin/public/index.html +++ b/admin/public/index.html @@ -5,6 +5,17 @@ + +

Initializing... {{vm.hello}}

@@ -34,6 +45,20 @@
+
+

Global Settings:

+
+
Pathname: + +
Modulename: {{modulename}} +
Target: + +
+
+
+
+ +

Per-Domain Settings:


@@ -51,13 +76,6 @@ 
{{vm.config}}
-
    -
  • Show Device Name
    • -
  • Login to Daplie
    • -
  • Show domains (or ask purchase)
    • -
  • Tunnel On
    • -
  • Show configured domains
    • -
diff --git a/bin/goldilocks.js b/bin/goldilocks.js index 44cbe0b..e7f8808 100755 --- a/bin/goldilocks.js +++ b/bin/goldilocks.js @@ -431,6 +431,9 @@ function run() { opts.assetsPath = path.join(__dirname, '..', 'packages', 'assets'); opts.webRoot = defaultWebRoot; + // ifaces + opts.ifaces = require('../lib/local-ip.js').find(); + // TODO use arrays in all things opts._old_server_name = Object.keys(opts.sites)[0]; opts.pubdir = defaultWebRoot.replace(/(:hostname|:servername).*/, ''); @@ -518,8 +521,6 @@ function run() { // TODO what is this condition actually intending to test again? // (I think it can be replaced with if (!opts._externalHost) { ... } - // ifaces - opts.ifaces = require('../lib/local-ip.js').find(); promise = PromiseA.resolve(); } else { console.info("Attempting to resolve external connection for '" + opts._old_server_name + "'"); diff --git a/packages/assets/org.oauth3 b/packages/assets/org.oauth3 index f179cfe..356a2d3 160000 --- a/packages/assets/org.oauth3 +++ b/packages/assets/org.oauth3 @@ -1 +1 @@ -Subproject commit f179cfe3c9553718676db24f1203f67ea0427662 +Subproject commit 356a2d3131bcc6d0f6199a1d2039dcdcee0e3481