Upload facilities added, Ambit disabled

2 files changed, 20 insertions, 23 deletions

diff --git a/lib/templates/config.ru b/lib/templates/config.ru
deleted file mode 100644
index 81cea9d..0000000
--- a/lib/templates/config.ru
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'rubygems'
-require 'opentox-ruby-api-wrapper'
-require 'application.rb'
-require 'rack'
-require 'rack/contrib'
-
-FileUtils.mkdir_p @@tmp_dir
-log = File.new("#{@@tmp_dir}/#{ENV["RACK_ENV"]}.log", "a+")
-$stdout.reopen(log)
-$stderr.reopen(log)
- 
-use Rack::ShowExceptions
-run Sinatra::Application
diff --git a/lib/templates/config.yaml b/lib/templates/config.yaml
index 7b46d43..ad7c4ab 100644
--- a/lib/templates/config.yaml
+++ b/lib/templates/config.yaml
@@ -1,10 +1,20 @@
-:base_dir: /home/ch/webservices
-:webserver: thin
-:services:
-# make sure to enter a full uri (including training slash)
-  opentox-compound:      "http://localhost:4000/"
-  opentox-feature:       "http://localhost:4001/"
-  opentox-dataset:       "http://localhost:4002/"
-  opentox-algorithm:     "http://localhost:4003/"
-  opentox-model:         "http://localhost:4004/"
-  #opentox-task:          "http://localhost:4005/"
+# Example configuration for OpenTox, please adjust to your settings
+# 
+# Example 1: Using external test services
+#
+# :services:
+#  opentox-compound:      "http://webservices.in-silico.ch/test/compound/"
+#  opentox-dataset:       "http://webservices.in-silico.ch/test/dataset/"
+#  opentox-algorithm:     "http://webservices.in-silico.ch/test/algorithm/"
+#  opentox-model:         "http://webservices.in-silico.ch/test/model/"
+#  opentox-task:         "http://webservices.in-silico.ch/test/task/"
+#
+# Example 2: Using local services
+# :base_dir: /home/ch/webservices
+# :webserver: thin
+# :services:
+#   opentox-compound:      "http://localhost:4000/"
+#   opentox-dataset:       "http://localhost:4001/"
+#   opentox-algorithm:     "http://localhost:4002/"
+#   opentox-model:         "http://localhost:4003/"
+#   opentox-task:          "http://localhost:4004/"