From 6335bd2fe94f268b7a823cf7639413df15b9c535 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ubuntu.redbudcomputer.local>
Date: Thu, 11 Jun 2020 20:29:52 +0000
Subject: [PATCH] Add a new production config.

---
 .../{config.yml => config.yml.development}    | 26 ++-----------
 packages/console-app/config.yml.production    | 37 +++++++++++++++++++
 packages/console-app/package.json             |  5 ++-
 packages/console-app/src/version.json         |  2 +-
 packages/console-server/config.yml            | 15 +++-----
 5 files changed, 51 insertions(+), 34 deletions(-)
 rename packages/console-app/{config.yml => config.yml.development} (59%)
 create mode 100644 packages/console-app/config.yml.production

diff --git a/packages/console-app/config.yml b/packages/console-app/config.yml.development
similarity index 59%
rename from packages/console-app/config.yml
rename to packages/console-app/config.yml.development
index 6f30af7..44be444 100644
--- a/packages/console-app/config.yml
+++ b/packages/console-app/config.yml.development
@@ -12,7 +12,7 @@ app:
 
 api:
   path: '/api'
-  port: 4000
+  port: 9004
   intervalLog: 5000
   pollInterval: 10000
 
@@ -26,33 +26,15 @@ services:
 
   wns:
     server: 'http://127.0.0.1:9473/api'
-    webui: 'http://127.0.0.1:9473/webui'
+    webui: 'http://127.0.0.1:9473/console'
 
   signal:
     server: 'ws://127.0.0.1:4000'
     api: 'http://127.0.0.1:4000'
 
   ipfs:
-    server: 'https://127.0.0.1:5001'
-    gateway: 'http://127.0.0.1:8888'
+    server: 'http://127.0.0.1:5001'
+    gateway: 'http://127.0.0.1:8888/ipfs/'
 
   wellknown:
     endpoint: 'http://127.0.0.1:9000/.well-known/dxos'
-
-routes:
-  app:
-    server: '/app'
-
-  wns:
-    server: '/dxos/wns/api'
-    webui: '/dxos/wns/console'
-
-  signal:
-    api: '/dxos/signal'
-
-  ipfs:
-    server: '/dxos/ipfs/api'
-    gateway: '/dxos/ipfs/gateway'
-
-  wellknown:
-    endpoint: '/.well-known/dxos'
diff --git a/packages/console-app/config.yml.production b/packages/console-app/config.yml.production
new file mode 100644
index 0000000..edbba2d
--- /dev/null
+++ b/packages/console-app/config.yml.production
@@ -0,0 +1,37 @@
+#
+# NODE_ENV === production
+# NOTE: Set CONFIG_FILE to swap out this config file.
+#
+
+app:
+  title: 'Console'
+  org': 'DxOS'
+  theme: 'dark'
+  website: 'https://dxos.org'
+  publicUrl: '/console'
+
+api:
+  path: '/api'
+  intervalLog: 5000
+  pollInterval: 10000
+
+system:
+  debug: 'dxos:console:*'
+
+routes:
+  app:
+    server: '/app'
+
+  wns:
+    server: '/dxos/wns/api'
+    webui: '/dxos/wns/console'
+
+  signal:
+    api: '/dxos/signal'
+
+  ipfs:
+    server: '/dxos/ipfs/api'
+    gateway: '/dxos/ipfs/gateway'
+
+  wellknown:
+    endpoint: '/.well-known/dxos'
diff --git a/packages/console-app/package.json b/packages/console-app/package.json
index 86ab695..f160266 100644
--- a/packages/console-app/package.json
+++ b/packages/console-app/package.json
@@ -8,10 +8,11 @@
   ],
   "scripts": {
     "analyzer": "webpack --config webpack-analyzer.config.js",
-    "build": "babel ./src --out-dir ./dist/es --ignore \"**/*.test.js\" --source-maps inline",
+    "build": "yarn dist",
+    "dist": "yarn clean && cp -f ${CONFIG_FILE:-config.yml.production} config.yml && webpack",
     "clean": "rm -rf dist",
     "lint": "semistandard 'src/**/*.js'",
-    "start": "VERBOSE=true webpack-dev-server --mode development",
+    "start": "cp -f ${CONFIG_FILE:-config.yml.development} config.yml && VERBOSE=true webpack-dev-server --mode development",
     "test": "jest --rootDir ./src --passWithNoTests --no-cache"
   },
   "author": "DxOS.org",
diff --git a/packages/console-app/src/version.json b/packages/console-app/src/version.json
index b81b53e..23b7a03 100644
--- a/packages/console-app/src/version.json
+++ b/packages/console-app/src/version.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "name":      "@dxos/console-app",
-    "buildDate": "2020-06-11T15:58:26.701Z",
+    "buildDate": "2020-06-11T20:25:34.551Z",
     "version":   "1.0.0-beta.0"
   }
 }
diff --git a/packages/console-server/config.yml b/packages/console-server/config.yml
index ac97bae..44be444 100644
--- a/packages/console-server/config.yml
+++ b/packages/console-server/config.yml
@@ -3,8 +3,6 @@
 # NOTE: Set CONFIG_FILE to swap out this config file.
 #
 
-# TODO(burdon): Set defaults.
-
 app:
   title: 'Console'
   org': 'DxOS'
@@ -14,7 +12,7 @@ app:
 
 api:
   path: '/api'
-  port: 4000
+  port: 9004
   intervalLog: 5000
   pollInterval: 10000
 
@@ -27,17 +25,16 @@ services:
     server: 'http://127.0.0.1:5999'
 
   wns:
-      server: 'https://node1.dxos.network/wns/api'
-      webui: 'https://node1.dxos.network/wns/webui'
+    server: 'http://127.0.0.1:9473/api'
+    webui: 'http://127.0.0.1:9473/console'
 
   signal:
-    server: 'http://127.0.0.1:4000'
+    server: 'ws://127.0.0.1:4000'
     api: 'http://127.0.0.1:4000'
 
   ipfs:
-    server: '/ip4/127.0.0.1/tcp/5001'
-    gateway: '/ip4//127.0.0.1:8888/ipfs/'
-    webui: 'http://127.0.0.1:5001/webui'
+    server: 'http://127.0.0.1:5001'
+    gateway: 'http://127.0.0.1:8888/ipfs/'
 
   wellknown:
     endpoint: 'http://127.0.0.1:9000/.well-known/dxos'