Merged config

2 files changed, 8 insertions, 22 deletions

diff --git a/config b/config
deleted file mode 100644
index e72242b..0000000
--- a/config
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Configuration options for OpenTox installations (sets shell variables for installation scripts)
-
-# Linux distribution (currently only debian)
-distribution=debian
-
-# Installation type
-# Options:
-# gem	  installs only the opentox-ruby gem (useful, if you want to use external services with the opentox-ruby DSL)
-# local   local installation (authentication and authorisation disabled)
-# server  inter or intranet server (authentication and authorisation enabled)
-install=server
-
-# Git branch of services
-# Options: master development
-# "master" installs the current stable version
-branch=master
-
diff --git a/config.sh b/config.sh
index af806e2..72c3fec 100644
--- a/config.sh
+++ b/config.sh
@@ -4,17 +4,22 @@
 # Author: Christoph Helma, Andreas Maunz.
 #
 
-# 1) Where all binaries are installed.
+# 1) Base setup
+OT_DIST="debian"       # Linux distribution    (debian)
+OT_INSTALL="local"     # Type                  (gem, local, server)
+OT_BRANCH="master"     # Maturity              (development, master)
+
+# 2) Where all binaries are installed.
 PREFIX="$HOME/opentox"
 JAVA_HOME="/usr/lib/jvm/java-6-sun"
 
-# 2) What versions to install.
+# 3) What versions to install.
 RUBY_NUM_VER="1.8.7-2011.03"
 OB_NUM_VER="2.2.3"
 KL_NUM_VER="0.9-11"
 REDIS_NUM_VER="2.2.2"
 
-# 3) Server settings.
+# 4) Server settings.
 NGINX_SERVERNAME="localhost"
 WWW_DEST="$PREFIX/www"