Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-01 00:08:27 +01:00
Code Issues Projects Releases Wiki Activity

Remove finn config #133

Browse Source
This commit is contained in:
Ivar 2016-06-16 18:17:07 +02:00
parent 350dbdcd31
commit 761dadabcb
4 changed files with 1 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
artifact.json
View File

@ -1,19 +0,0 @@
{
"ownership": [
{
"name": "Utviklingsproduktivitet",
"email": "utviklingsproduktivitet@finn.no"
}
],
"artifacts": {
"artifact": [
{
"name": "unleash-server",
"type": "service",
"description": "Unleash"
}
]
}
}

46
finnbuild.json
View File

@ -1,46 +0,0 @@
{
"links": {
"build": "https://travis-ci.org/finn-no/unleash/",
"repository": "https://github.com/finn-no/unleash",
"issues": "https://github.com/finn-no/unleash/issues"
},
"versions": {
"jdk": "1.8",
"mvn": "3",
"node": "5"
},
"tasks": {
"deploy": [
{"command": "npm install && npm run pg-virtualenv-test && npm run build"},
{"command": "tar -cvzf unleash-server.tar.gz --exclude=unleash-server.tar.gz --exclude=.git *"},
{
"command": "mvn deploy:deploy-file -Durl=http://mavenproxy.finntech.no/finntech-internal-snapshot/ -DrepositoryId=finntech-internal-snapshot -Dfile=unleash-server.tar.gz -DgroupId=no.finntech.unleash -DartifactId=unleash-server -Dversion=0.1337-SNAPSHOT -Dpackaging=tar.gz",
"pipelines": [
{
"name": "unleash-server",
"pattern": "Uploaded: +(http:.+unleash-server-.+.tar.gz)"
}
]
},
{ "command" : "docker build -t finntech/unleash-server:$FINNBUILD_RANDOM_HASH . && docker push finntech/unleash-server:$FINNBUILD_RANDOM_HASH" },
{ "command" : "rm -rf sql && mkdir sql" },
{ "command" : "scripts/generate-liquibase-artifact.js > sql/db.changelog-master.xml"},
{ "command" : "jar -cf unleash-db.jar sql"},
{
"command": "mvn deploy:deploy-file -Durl=http://mavenproxy.finntech.no/finntech-internal-snapshot/ -DrepositoryId=finntech-internal-snapshot -Dfile=unleash-db.jar -DgroupId=no.finntech.unleash -DartifactId=unleash-db -Dversion=0.1337-SNAPSHOT -Dpackaging=jar",
"pipelines": [
{
"name": "unleash-db",
"pattern": "Uploaded:\\s+(http:.+unleash-db-.+\\.jar)"
}
]
},
],
"default": [
{"command": "npm install && npm run pg-virtualenv-test"},
{"command" : "docker build -t finntech/unleash-server:$FINNBUILD_RANDOM_HASH ." },
]
}
}

29
lib/databaseConfig.js
View File

@ -1,29 +0,0 @@
var nconf = require('nconf');
var fs = require('fs');
var ini = require('ini');
var logger = require('./logger');
function getDatabaseIniUrl() {
// Finn specific way of delivering env variables
var databaseini = nconf.argv().get('databaseini');
var config = ini.parse(fs.readFileSync(databaseini, 'utf-8'));
logger.info('unleash started with databaseini: ' + databaseini);
return config.DATABASE_URL;
}
function getDatabaseUrl() {
if (process.env.DATABASE_URL) {
logger.info('unleash started with DATABASE_URL');
return process.env.DATABASE_URL;
} else if (nconf.argv().get('databaseini') !== undefined) {
return getDatabaseIniUrl();
}
throw new Error('please set DATABASE_URL or pass --databaseini');
}
module.exports = {
getDatabaseUrl: getDatabaseUrl
};

2
server-impl.js
View File

@ -1,5 +1,5 @@
var logger = require('./lib/logger');
var defaultDatabaseUri = require('./lib/databaseConfig').getDatabaseUrl();
var defaultDatabaseUri = process.env.DATABASE_URL;
function start(options) {
options = options || {};