From 6593ef81ea16284b17f9445f86fc4105ddda323c Mon Sep 17 00:00:00 2001
From: "Theunis J. Botha" <theunis.botha1@gmail.com>
Date: Tue, 8 Nov 2016 18:30:09 +0100
Subject: [PATCH] fixed configs

---
 3d-editor.conf |  2 +-
 app.conf       |  6 +++---
 config.js      | 22 +++++++++++++---------
 secure.js      | 46 ++++++++++++++++++++++++++++++++++++----------
 4 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/3d-editor.conf b/3d-editor.conf
index f2b609d..e913ec0 100644
--- a/3d-editor.conf
+++ b/3d-editor.conf
@@ -4,7 +4,7 @@ server {
 
 	server_name 3d-editor.gamewheel.local 3d-editor-debug.gamewheel.local;
 
-	root /usr/share/gamewheel/3d-editor;
+	root /usr/share/gamewheel/gw_3d_editor;
 
 	location ~ \.php$ {
 		fastcgi_pass    127.0.0.1:9001;
diff --git a/app.conf b/app.conf
index 3fd2408..d0b2fd9 100644
--- a/app.conf
+++ b/app.conf
@@ -4,16 +4,16 @@ server {
 
 	server_name app.gamewheel.local;
 
-	root /usr/share/gamewheel/gw-app;
+	root /usr/share/gamewheel/gw-app/dist;
 
     location / {
         proxy_pass_request_headers on;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-NginX-Proxy true;
-        proxy_pass http://127.0.0.1:3104;
+        proxy_pass http://127.0.0.1:3106;
         proxy_ssl_session_reuse off;
         proxy_set_header Host $http_host;
         proxy_redirect off;
     }
-}
\ No newline at end of file
+}
diff --git a/config.js b/config.js
index a14cdf2..faa8579 100644
--- a/config.js
+++ b/config.js
@@ -25,22 +25,26 @@ var config = {
             subAccount: 'root'
         }
     },
-    app : {
+    app: {
         url: 'http://app.gamewheel.local'
     },
-    api : {
-        url : 'http://api.gamewheel.local'
+    api: {
+        url: 'http://api.gamewheel.local'
     },
-    old_api_runtime : {
-        url : 'http://api-runtime.gamewheel.local'
+    api_runtime: {
+        url: 'http://api-runtime.gamewheel.local',
+        version: "1.0.0"
     },
-    statistics : {
-        url : 'http://api-runtime.gamewheel.local'
+    masker: {
+        url: 'http://masker.gamewheel.local'
     },
-    port : {
+    statistics: {
+        url: 'http://api-runtime.gamewheel.local'
+    },
+    port: {
         url: 'http://port.gamewheel.local'
     },
-    gate : {
+    gate: {
         url: 'http://gate.gamewheel.local'
     },
     environment: {
diff --git a/secure.js b/secure.js
index 0c5e3d8..b7303a8 100644
--- a/secure.js
+++ b/secure.js
@@ -1,11 +1,9 @@
 var secure = {
     vr_pong: {
-        url: "http://pong.gamewheel.local",
         port: 3101,
         debugPort: 3201
     },
     vr_racer: {
-        url: "http://racer.gamewheel.local",
         port: 3102,
         debugPort: 3202
     },
@@ -49,11 +47,12 @@ var secure = {
     tools: {
         port: 3105,
         debugPort: 3205,
+        liveReloadPort: 3405,
         mysqlUserExport: {
-            host: "gwdb.cpuanrat3vd1.eu-central-1.rds.amazonaws.com",
+            host: "127.0.0.1",
             port: 3306,
             user: "root",
-            password: "5t0bURlq",
+            password: "",
             database: "gw_core"
         },
         mongoUserImport: {
@@ -67,22 +66,49 @@ var secure = {
     },
     app: {
         port: 3106,
-        debugPort: 3206
+        debugPort: 3206,
+        liveReloadPort: 3406
     },
     api: {
         port: 3107,
         debugPort: 3207
     },
-    old_api_runtime: {
+    api_runtime: {
         port: 3108,
-        debugPort: 3208
+        debugPort: 3208,
+        liveReloadPort: 3408,
+        cors: true,
+        cluster: false,
+        auth: {
+            secret: "xDKsyQm2F52Y9hfqv7yG80tu1wv90zkH",
+            token_duration: 86400000,
+            api_key: "gw_rocks",
+            admin: {
+                email: "admin@gamewheel.com",
+                password: "gw_config_api_rocks"
+            }
+        },
+        db: {
+            type: "mysql",
+            host: "127.0.0.1",
+            port: 3306,
+            database: "gw_core",
+            user: "root",
+            password: "",
+            max_connections: 10
+        },
+        game_session_timeout: 180000
+    },
+    masker: {
+        auth_key: "gw_masker_rocks"
     },
     statistics: {
         port: 3109,
         debugPort: 3209,
-        mongodb : {
-            host : 'mongodb://172.31.12.120',
-            db : 'statistic'
+        liveReloadPort: 3409,
+        mongodb: {
+            host: 'mongodb://127.0.0.1',
+            db: 'statistic'
         }
     },
     port: {