updated to .js from .json configuration

cosmos-auth/conf/cosmos-auth.json → 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>

cosmos-auth/package.json → 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>

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');

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

cosmos-gui/conf/cosmos-gui.json → 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>

cosmos-gui/package.json → 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>

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,

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');

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

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

cosmos-proxy/conf/cosmos-proxy.json → 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>

cosmos-proxy/package.json → 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>

cosmos-tidoop-api/conf/cosmos-tidoop-api.json → 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>

cosmos-tidoop-api/package.json → 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>

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

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