Merge pull request #134 from finn-no/remove_finn_stuff

Remove finn config #133

.dockerignore

@@ -1,5 +1,3 @@
 .git
 docker-compose.yml
 node_modules
-artifact.json
-finnbuild.json

Vagrantfile

@@ -1,20 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.require_version ">= 1.7.0"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.provider "virtualbox" do |v|
-    v.memory = 2048
-    v.cpus = 2
-  end
-
-  config.vm.box = "boxcutter/ubuntu1410-docker"
-
-  config.vm.network "private_network", ip: "192.168.12.34"
-
-  config.vm.provision "shell", inline: "/vagrant/helpers/install.sh"
-end

artifact.json

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

finnbuild.json

@@ -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 ." },
-
-    ]
-  }
-}

helpers/install.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-echo ""
-sudo apt-get install unzip
-
-curl -L -O https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip
-
-unzip 0.5.2_linux_amd64.zip -d /usr/bin
-
-consul agent -data-dir=/tmp/consul -dc=oslo0 &
-consul join dev-mod2.finntech.no
-consul members

lib/databaseConfig.js

@@ -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
-};

package.json

@@ -62,7 +62,6 @@
     "errorhandler": "1.3.5",
     "express": "4.13.4",
     "express-validator": "2.20.3",
-    "ini": "1.3.4",
     "install": "^0.6.1",
     "jsx-loader": "0.12.2",
     "jsxhint": "0.13.2",
@@ -70,7 +69,6 @@
     "lodash": "^3.5.0",
     "log4js": "0.6.35",
     "moment": "^2.13.0",
-    "nconf": "0.8.4",
     "npm": "^3.8.8",
     "pg": "^4.5.5",
     "react": "^0.13.1",

server-impl.js

@@ -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 || {};