Commit e2c9241d authored by a001188's avatar a001188
Browse files

Merge origin/master

Conflicts:
	routes/access.js
	routes/ci.js
	routes/config-template.js
	routes/index.js
	routes/options.js
	routes/organisation.js
	routes/relation.js
	routes/structure.js
parent 85dcbc67
......@@ -6,7 +6,7 @@ const path = require('path');
const config = require('./config');
const pg = require('pg');
const winston = require('winston');
const connectionString = process.env.DATABASE_URL || config.storageConfig;
const connectionString = process.env.DATABASE_URL || config.db_url;
router.post('/types', (req, res, next) => {
......
......@@ -7,7 +7,7 @@ var options = require('./options');
const pg = require('pg');
const config = require('./config');
const winston = require('winston');
const connectionString = process.env.DATABASE_URL || config.storageConfig;
const connectionString = process.env.DATABASE_URL || config.db_url;
router.post('/enterprise_service/list', (req, res, next) => {
var pool = new pg.Pool({
......
module.exports.storageConfig='postgres://user:password@server:port/database';
module.exports.db_url='postgres://user:password@server:port/database';
......@@ -5,7 +5,7 @@ const path = require('path');
const config = require('./config');
const pg = require('pg');
const winston = require('winston');
const connectionString = process.env.DATABASE_URL || config.storageConfig;
const connectionString = process.env.DATABASE_URL || config.db_url;
/* GET home page. */
......
......@@ -6,7 +6,7 @@ const path = require('path');
const config = require('./config');
const pg = require('pg');
const winston = require('winston');
const connectionString = process.env.DATABASE_URL || config.storageConfig;
const connectionString = process.env.DATABASE_URL || config.db_url;
router.post('/family_type', (req, res, next) => {
var pool = new pg.Pool({
......
......@@ -6,7 +6,7 @@ const path = require('path');
const config = require('./config');
const pg = require('pg');
const winston = require('winston');
const connectionString = process.env.DATABASE_URL || config.storageConfig;
const connectionString = process.env.DATABASE_URL || config.db_url;
router.get('/list/nodes/:centralNode', (req, res, next) => {
......
......@@ -6,7 +6,7 @@ const path = require('path');
const config = require('./config');
const pg = require('pg');
const winston = require('winston');
const connectionString = process.env.DATABASE_URL || config.storageConfig;
const connectionString = process.env.DATABASE_URL || config.db_url;
router.post('/types', (req, res, next) => {
......
......@@ -6,7 +6,7 @@ const path = require('path');
const config = require('./config');
const pg = require('pg');
const winston = require('winston');
const connectionString = process.env.DATABASE_URL || config.storageConfig;
const connectionString = process.env.DATABASE_URL || config.db_url;
router.post('/family_types', (req, res, next) => {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment