From f50df547e8c26942d503233afe0e2917ca955720 Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova79@gmail.com>
Date: Thu, 1 Mar 2012 18:55:42 +0100
Subject: [PATCH] Feature #1073: Add support for mysql and posgresql in oZones
 server

---
 src/ozones/Server/etc/ozones-server.conf |  1 +
 src/ozones/Server/ozones-server.rb       | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/ozones/Server/etc/ozones-server.conf b/src/ozones/Server/etc/ozones-server.conf
index 022158205e..8b09856d69 100644
--- a/src/ozones/Server/etc/ozones-server.conf
+++ b/src/ozones/Server/etc/ozones-server.conf
@@ -23,6 +23,7 @@
 ######################
 
 :databasetype: sqlite
+#:databaseserver: dbuser:dbpassword@localhost
 #:htaccess: /var/www/.htaccess
 :dbdebug: no
 
diff --git a/src/ozones/Server/ozones-server.rb b/src/ozones/Server/ozones-server.rb
index 84dc77d9b7..a3fb9d8b85 100755
--- a/src/ozones/Server/ozones-server.rb
+++ b/src/ozones/Server/ozones-server.rb
@@ -57,7 +57,20 @@ config=YAML::load(config_data)
 
 db_type = config[:databasetype]
 
-db_url = db_type + "://" + VAR_LOCATION + "/ozones.db"
+case db_type
+    when "sqlite" then
+        db_url = db_type + "://" + VAR_LOCATION + "/ozones.db"
+    when "mysql","postgres" then
+        if config[:databaseserver].nil?
+            warn "DB server needed for this type of DB backend"
+            exit -1
+        end
+
+        db_url = db_type + "://" + config[:databaseserver] + "/ozones"
+    else 
+        warn "DB type #{db_type} not recognized"
+        exit -1
+end
 
 ##############################################################################
 # DB bootstrapping