summaryrefslogtreecommitdiff
path: root/lib/environment.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-08-16 14:46:31 +0200
committerChristoph Helma <helma@in-silico.ch>2011-08-16 14:46:31 +0200
commit64354959e04fcac11bcf70e75099691b74573033 (patch)
treec858f073e1acfcf621f7d2c55b2ae623a7329001 /lib/environment.rb
parentb98bc374b119e5a21f43d4f45048376aeeeead09 (diff)
initial minimal version
Diffstat (limited to 'lib/environment.rb')
-rw-r--r--lib/environment.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/environment.rb b/lib/environment.rb
index 28a9a66..cae743c 100644
--- a/lib/environment.rb
+++ b/lib/environment.rb
@@ -24,7 +24,7 @@ end
# database
#`redis-server /opt/redis/redis.conf` unless File.exists? "/var/run/redis.pid" # removed by AM
-Ohm.connect :thread_safe => true
+# Ohm.connect :thread_safe => true
# load mail settings for error messages
#load File.join config_dir,"mail.rb" if File.exists?(File.join config_dir,"mail.rb")
@@ -69,11 +69,6 @@ class OwlNamespace
end
-AA_SERVER = CONFIG[:authorization] ? (CONFIG[:authorization][:server] ? CONFIG[:authorization][:server] : nil) : nil
-CONFIG[:authorization][:authenticate_request] = [""] unless CONFIG[:authorization][:authenticate_request]
-CONFIG[:authorization][:authorize_request] = [""] unless CONFIG[:authorization][:authorize_request]
-CONFIG[:authorization][:free_request] = [""] unless CONFIG[:authorization][:free_request]
-
RDF = OwlNamespace.new 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
OWL = OwlNamespace.new 'http://www.w3.org/2002/07/owl#'
DC = OwlNamespace.new 'http://purl.org/dc/elements/1.1/'
@@ -81,3 +76,8 @@ OT = OwlNamespace.new 'http://www.opentox.org/api/1.1#'
OTA = OwlNamespace.new 'http://www.opentox.org/algorithmTypes.owl#'
XSD = OwlNamespace.new 'http://www.w3.org/2001/XMLSchema#'
+AA_SERVER = CONFIG[:authorization] ? (CONFIG[:authorization][:server] ? CONFIG[:authorization][:server] : nil) : nil
+CONFIG[:authorization][:authenticate_request] = [""] unless CONFIG[:authorization][:authenticate_request]
+CONFIG[:authorization][:authorize_request] = [""] unless CONFIG[:authorization][:authorize_request]
+CONFIG[:authorization][:free_request] = [""] unless CONFIG[:authorization][:free_request]
+