Merge branch 'master' into multiple-hosts

Conflicts:
	capsulflask/console.py
	capsulflask/db.py
	capsulflask/shared.py
	capsulflask/virt_model.py

capsulflask/db.py

@@ -9,6 +9,7 @@ from flask import current_app
 from flask import g
 
 from capsulflask.db_model import DBModel
+from capsulflask.shared import my_exec_info_message
 
 def init_app(app):
   databaseUrl = urlparse(app.config['DATABASE_URL'])
@@ -20,7 +21,8 @@ def init_app(app):
     password = databaseUrl.password,
     host = databaseUrl.hostname,
     port = databaseUrl.port,
-    database = databaseUrl.path[1:]
+    database = databaseUrl.path[1:],
+    sslmode = app.config['DATABASE_SSLMODE']
   )
 
   schemaMigrations = {}
@@ -40,7 +42,7 @@ def init_app(app):
   hasSchemaVersionTable = False
   actionWasTaken = False
   schemaVersion = 0
-  desiredSchemaVersion = 9
+  desiredSchemaVersion = 13
 
   cursor = connection.cursor()
 
@@ -126,4 +128,3 @@ def close_db(e=None):
     db_model.cursor.close()
     current_app.config['PSYCOPG2_CONNECTION_POOL'].putconn(db_model.connection)
 
-