From ef6e6dee6e0fb78f9ce5c6efbd42611859a910a8 Mon Sep 17 00:00:00 2001
From: Fran Boon <fran@aidiq.com>
Date: Wed, 23 May 2018 10:17:22 +0100
Subject: [PATCH] Setup: fix

---
 VERSION               | 2 +-
 modules/s3db/setup.py | 8 +++++---
 private/eden_deploy   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 04048663e0..f0464f603d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4a4b3b3 (2018-05-23 10:04:09)
\ No newline at end of file
+d4035cf (2018-05-23 10:17:22)
\ No newline at end of file
diff --git a/modules/s3db/setup.py b/modules/s3db/setup.py
index 772344e5d2..774d977e7e 100644
--- a/modules/s3db/setup.py
+++ b/modules/s3db/setup.py
@@ -900,7 +900,7 @@ def setup_instance_clean(r, **attr):
 
         setup_instance_method(r.component_id, "clean")
 
-        current.session.confirmation = current.T("Instance Cleaned")
+        current.session.confirmation = current.T("Instance Clean Started")
 
         redirect(URL(c="setup", f="deployment",
                      args = [r.id, "instance"]),
@@ -1966,7 +1966,8 @@ def setup_instance_method(instance_id, method="start"):
 
     # Get Deployment details
     dtable = s3db.setup_deployment
-    deployment = db(dtable.id == deployment_id).select(dtable.webserver_type,
+    deployment = db(dtable.id == deployment_id).select(dtable.db_type,
+                                                       dtable.webserver_type,
                                                        limitby=(0, 1)
                                                        ).first()
 
@@ -1978,7 +1979,8 @@ def setup_instance_method(instance_id, method="start"):
                  "remote_user": server.remote_user,
                  "become_method": "sudo",
                  "become_user": "root",
-                 "vars": {"web_server": WEB_SERVERS[deployment.webserver_type],
+                 "vars": {"db_type": DB_SERVERS[deployment.db_type],
+                          "web_server": WEB_SERVERS[deployment.webserver_type],
                           "type": INSTANCE_TYPES[instance.type],
                           },
                  "roles": [{ "role": "%s/%s" % (roles_path, method) },
diff --git a/private/eden_deploy b/private/eden_deploy
index 83d22b3c4d..30b3af2961 160000
--- a/private/eden_deploy
+++ b/private/eden_deploy
@@ -1 +1 @@
-Subproject commit 83d22b3c4d95b16266b989749acdfc75eb08b5ab
+Subproject commit 30b3af2961c3dd40c6966993d11879a21573311d