From 77807c8b7a6dcf2c2126de135fb26d5eff5cd45f Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Thu, 23 Jan 2020 06:55:46 +0530
Subject: [PATCH] updated to .js configuration

---
 cosmos-auth/conf/{cosmos-auth.json => cosmos-auth.js}         | 4 +++-
 cosmos-auth/{package.json => package.js}                      | 4 +++-
 cosmos-auth/src/cosmos_auth.js                                | 4 ++--
 cosmos-auth/src/logger.js                                     | 2 +-
 cosmos-gui/conf/{cosmos-gui.json => cosmos-gui.js}            | 4 +++-
 cosmos-gui/{package.json => package.js}                       | 4 +++-
 cosmos-gui/src/app_utils.js                                   | 2 +-
 cosmos-gui/src/cosmos_gui.js                                  | 2 +-
 cosmos-gui/src/logger.js                                      | 2 +-
 cosmos-gui/src/mysql_driver.js                                | 2 +-
 cosmos-proxy/conf/{cosmos-proxy.json => cosmos-proxy.js}      | 4 +++-
 cosmos-proxy/{package.json => package.js}                     | 4 +++-
 .../conf/{cosmos-tidoop-api.json => cosmos-tidoop-api.js}     | 4 +++-
 cosmos-tidoop-api/{package.json => package.js}                | 4 +++-
 cosmos-tidoop-api/src/logger.js                               | 2 +-
 cosmos-tidoop-api/src/tidoop_api.js                           | 4 ++--
 16 files changed, 34 insertions(+), 18 deletions(-)
 rename cosmos-auth/conf/{cosmos-auth.json => cosmos-auth.js} (92%)
 rename cosmos-auth/{package.json => package.js} (92%)
 rename cosmos-gui/conf/{cosmos-gui.json => cosmos-gui.js} (96%)
 rename cosmos-gui/{package.json => package.js} (94%)
 rename cosmos-proxy/conf/{cosmos-proxy.json => cosmos-proxy.js} (92%)
 rename cosmos-proxy/{package.json => package.js} (91%)
 rename cosmos-tidoop-api/conf/{cosmos-tidoop-api.json => cosmos-tidoop-api.js} (88%)
 rename cosmos-tidoop-api/{package.json => package.js} (92%)

diff --git a/cosmos-auth/conf/cosmos-auth.json b/cosmos-auth/conf/cosmos-auth.js
similarity index 92%
rename from cosmos-auth/conf/cosmos-auth.json
rename to cosmos-auth/conf/cosmos-auth.js
index 2f1913f..d6dfed9 100644
--- a/cosmos-auth/conf/cosmos-auth.json
+++ b/cosmos-auth/conf/cosmos-auth.js
@@ -1,4 +1,5 @@
-{
+<script>
+var auth = {
   "host": "localhost",
   "port": 13000,
   "private_key_file": "",
@@ -17,3 +18,4 @@
     "date_pattern": ".dd-MM-yyyy"
   }
 }
+</script>
diff --git a/cosmos-auth/package.json b/cosmos-auth/package.js
similarity index 92%
rename from cosmos-auth/package.json
rename to cosmos-auth/package.js
index e61b215..9bf6818 100644
--- a/cosmos-auth/package.json
+++ b/cosmos-auth/package.js
@@ -1,4 +1,5 @@
-{
+<script>
+var pkg = {
   "name": "cosmos-auth",
   "description": "Node.js app exposing Cosmos Auth API",
   "version": "1.0.0-next",
@@ -15,3 +16,4 @@
     "start": "node ./src/cosmos_auth.js"
   }
 }
+</script>
diff --git a/cosmos-auth/src/cosmos_auth.js b/cosmos-auth/src/cosmos_auth.js
index 64a1af5..a8f7e1e 100644
--- a/cosmos-auth/src/cosmos_auth.js
+++ b/cosmos-auth/src/cosmos_auth.js
@@ -26,8 +26,8 @@
 // Module dependencies
 var Hapi = require('hapi');
 var boom = require('boom');
-var packageJson = require('../package.json');
-var config = require('../conf/cosmos-auth.json');
+var packageJson = require('../package.js');
+var config = require('../conf/cosmos-auth.js');
 var client = require('./client.js');
 var fs = require('fs');
 var logger = require('./logger.js');
diff --git a/cosmos-auth/src/logger.js b/cosmos-auth/src/logger.js
index f52b424..3a50bf4 100644
--- a/cosmos-auth/src/logger.js
+++ b/cosmos-auth/src/logger.js
@@ -24,7 +24,7 @@
  */
 
 // Module dependencies
-var config = require('../conf/cosmos-auth.json');
+var config = require('../conf/cosmos-auth.js');
 var winston = require('winston');
 
 // Global variables
diff --git a/cosmos-gui/conf/cosmos-gui.json b/cosmos-gui/conf/cosmos-gui.js
similarity index 96%
rename from cosmos-gui/conf/cosmos-gui.json
rename to cosmos-gui/conf/cosmos-gui.js
index 216471b..dca39c9 100644
--- a/cosmos-gui/conf/cosmos-gui.json
+++ b/cosmos-gui/conf/cosmos-gui.js
@@ -1,4 +1,5 @@
-{
+<script>
+var gui  = {
   "gui": {
     "port": 443,
     "private_key_file": "",
@@ -43,3 +44,4 @@
     "level": "INFO"
   }
 }
+</script>
diff --git a/cosmos-gui/package.json b/cosmos-gui/package.js
similarity index 94%
rename from cosmos-gui/package.json
rename to cosmos-gui/package.js
index 0265a0b..356a1cf 100644
--- a/cosmos-gui/package.json
+++ b/cosmos-gui/package.js
@@ -1,4 +1,5 @@
-{
+<script>
+var pkg = {
   "name": "cosmos-gui",
   "description": "Node.js GUI for Cosmos (Hadoop-based)",
   "version": "1.0.0-next",
@@ -21,3 +22,4 @@
     "start": "node ./src/cosmos_gui.js"
   }
 }
+</script>
diff --git a/cosmos-gui/src/app_utils.js b/cosmos-gui/src/app_utils.js
index ee8a7ae..52dfdd9 100644
--- a/cosmos-gui/src/app_utils.js
+++ b/cosmos-gui/src/app_utils.js
@@ -27,7 +27,7 @@
 var boom = require('boom');
 var cmdRunner = require('./cmd_runner.js');
 var logger = require('./logger.js');
-var usersBlacklist = require('../conf/cosmos-gui.json').users_blacklist;
+var usersBlacklist = require('../conf/cosmos-gui.js').users_blacklist;
 
 function provisionCluster(res, clusterPrivKey, clusterUser, clusterEndpoint, hdfsSuperuser, hdfsQuota, username) {
     cmdRunner.run('ssh', ['-tt', '-i', clusterPrivKey, clusterUser + '@' + clusterEndpoint,
diff --git a/cosmos-gui/src/cosmos_gui.js b/cosmos-gui/src/cosmos_gui.js
index b795ff6..716e143 100644
--- a/cosmos-gui/src/cosmos_gui.js
+++ b/cosmos-gui/src/cosmos_gui.js
@@ -30,7 +30,7 @@ var fs = require('fs');
 var boom = require('boom');
 var stylus = require('stylus');
 var nib = require('nib');
-var config = require('../conf/cosmos-gui.json');
+var config = require('../conf/cosmos-gui.js');
 var mysqlDriver = require('./mysql_driver.js');
 var OAuth2 = require('./oauth2').OAuth2;
 var logger = require('./logger.js');
diff --git a/cosmos-gui/src/logger.js b/cosmos-gui/src/logger.js
index 0880d60..86ba32b 100644
--- a/cosmos-gui/src/logger.js
+++ b/cosmos-gui/src/logger.js
@@ -34,7 +34,7 @@ LoggingLevel = {
 };
 
 // Module dependencies
-var config = require('../conf/cosmos-gui.json');
+var config = require('../conf/cosmos-gui.js');
 var winston = require('winston');
 
 // Global variables
diff --git a/cosmos-gui/src/mysql_driver.js b/cosmos-gui/src/mysql_driver.js
index e6110e7..9510b74 100644
--- a/cosmos-gui/src/mysql_driver.js
+++ b/cosmos-gui/src/mysql_driver.js
@@ -25,7 +25,7 @@
 
 // Module dependencies
 var mysql = require('mysql');
-var mysqlConfig = require('../conf/cosmos-gui.json').mysql;
+var mysqlConfig = require('../conf/cosmos-gui.js').mysql;
 var logger = require('./logger.js');
 
 // Create a pool of connections to the database
diff --git a/cosmos-proxy/conf/cosmos-proxy.json b/cosmos-proxy/conf/cosmos-proxy.js
similarity index 92%
rename from cosmos-proxy/conf/cosmos-proxy.json
rename to cosmos-proxy/conf/cosmos-proxy.js
index 33dabb3..a3a2751 100644
--- a/cosmos-proxy/conf/cosmos-proxy.json
+++ b/cosmos-proxy/conf/cosmos-proxy.js
@@ -1,4 +1,5 @@
-{
+<script>
+var proxy = {
   "host": "0.0.0.0",
   "port": "14000",
   "target": {
@@ -20,3 +21,4 @@
   },
   "cache_file": "/etc/cosmos/cosmos-proxy/cache-dump.json"
 }
+</script>
diff --git a/cosmos-proxy/package.json b/cosmos-proxy/package.js
similarity index 91%
rename from cosmos-proxy/package.json
rename to cosmos-proxy/package.js
index ac312a5..13ef56c 100644
--- a/cosmos-proxy/package.json
+++ b/cosmos-proxy/package.js
@@ -1,4 +1,5 @@
-{
+<script>
+var pkg = {
   "name": "frb-cosmos-proxy",
   "description": "Custom PEP Http proxy for Cosmos",
   "version": "1.0.0-next",
@@ -14,3 +15,4 @@
     "start": "node ./src/cosmos-proxy.js"
   }
 }
+</script>
diff --git a/cosmos-tidoop-api/conf/cosmos-tidoop-api.json b/cosmos-tidoop-api/conf/cosmos-tidoop-api.js
similarity index 88%
rename from cosmos-tidoop-api/conf/cosmos-tidoop-api.json
rename to cosmos-tidoop-api/conf/cosmos-tidoop-api.js
index a913329..23d2299 100644
--- a/cosmos-tidoop-api/conf/cosmos-tidoop-api.json
+++ b/cosmos-tidoop-api/conf/cosmos-tidoop-api.js
@@ -1,4 +1,5 @@
-{
+</script>
+var tidoop = {
   "host": "localhost",
   "port": 12000,
   "storage_cluster": {
@@ -10,3 +11,4 @@
     "date_pattern": ".dd-MM-yyyy"
   }
 }
+</script>
diff --git a/cosmos-tidoop-api/package.json b/cosmos-tidoop-api/package.js
similarity index 92%
rename from cosmos-tidoop-api/package.json
rename to cosmos-tidoop-api/package.js
index f85bb1e..a05344b 100644
--- a/cosmos-tidoop-api/package.json
+++ b/cosmos-tidoop-api/package.js
@@ -1,4 +1,5 @@
-{
+<script>
+var pkg = {
   "name": "cosmos-tidoop-api",
   "description": "Node.js app exposing the Tidoop REST API",
   "version": "1.0.0-next",
@@ -14,3 +15,4 @@
     "start": "node ./src/tidoop_api.js"
   }
 }
+</script>
diff --git a/cosmos-tidoop-api/src/logger.js b/cosmos-tidoop-api/src/logger.js
index f73928f..bf9d5d6 100644
--- a/cosmos-tidoop-api/src/logger.js
+++ b/cosmos-tidoop-api/src/logger.js
@@ -24,7 +24,7 @@
  */
 
 // Module dependencies
-var config = require('../conf/cosmos-tidoop-api.json');
+var config = require('../conf/cosmos-tidoop-api.js');
 var winston = require('winston');
 
 // Global variables
diff --git a/cosmos-tidoop-api/src/tidoop_api.js b/cosmos-tidoop-api/src/tidoop_api.js
index 596431b..806928f 100644
--- a/cosmos-tidoop-api/src/tidoop_api.js
+++ b/cosmos-tidoop-api/src/tidoop_api.js
@@ -26,8 +26,8 @@
 // Module dependencies
 var Hapi = require('hapi');
 var cmdRunner = require('./cmd_runner.js');
-var packageJson = require('../package.json');
-var config = require('../conf/cosmos-tidoop-api.json');
+var packageJson = require('../package.js');
+var config = require('../conf/cosmos-tidoop-api.js');
 var logger = require('./logger.js');
 
 // Create a Hapi server with a host and port