Start having useful defaults for SQL

Mostly this means: Havintg a config_spec.ini that has a
local (relative to mediagoblin.ini) sqlite db with the name
"mediagoblin.db".

Also:
- Add to .gitignore
- Add a notice to mediagoblin.ini about the db

diff --git a/.gitignore b/.gitignore
index b46ec38a88ba738d7954f4dcb3ac88053ba6d029..e3a83822664bac8d44ce2a1fde954803b127221a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 /user_dev/
 /paste_local.ini
 /mediagoblin_local.ini
+/mediagoblin.db
 /server-log.txt
 
 # Tests

diff --git a/mediagoblin.ini b/mediagoblin.ini
index dbde6e5106e6013222815f0b2346615cd9f26e5a..223f0f4a0ae0d2b7590be3ccb60966f951e443e6 100644 (file)
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -5,6 +5,10 @@
 direct_remote_path = /mgoblin_static/
 email_sender_address = "notice@mediagoblin.example.org"
 
+## Uncomment and change to your DB's appropiate setting.
+## Default is a local sqlite db "mediagoblin.db".
+# sql_engine = postgresql:///gmg
+
 # set to false to enable sending notices
 email_debug_mode = true
 

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 2d410899a232e6f123f599c059189db611834f7b..2b4ba2f95ba131f4fb9308d8187d753a7b8e011a 100644 (file)
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -9,6 +9,7 @@ media_types = string_list(default=list("mediagoblin.media_types.image"))
 db_host = string()
 db_name = string(default="mediagoblin")
 db_port = integer()
+sql_engine = string(default="sqlite:///%(here)s/mediagoblin.db")
 
 # Where temporary files used in processing and etc are kept
 workbench_path = string(default="%(here)s/user_dev/media/workbench")

diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index 14a0b9117d7073caa7008529dc47fed266f8a706..36d6fc7f6a442c44f3e2d2eeff6dcbdb8ef27eec 100644 (file)
--- a/mediagoblin/db/sql/convert.py
+++ b/mediagoblin/db/sql/convert.py
@@ -148,8 +148,7 @@ def convert_media_comments(mk_db):
 def main():
     global_config, app_config = setup_global_and_app_config("mediagoblin.ini")
 
-    sql_conn, sql_db = sql_connect({'sql_engine': 'sqlite:///mediagoblin.db'})
-
+    sql_conn, sql_db = sql_connect(app_config)
     mk_conn, mk_db = mongo_connect(app_config)
 
     Base.metadata.create_all(sql_db.engine)