diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2012-02-18 11:00:13 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2012-02-18 19:34:11 +0100 |
| commit | a45631e3f3791071571da3a59bf6d3ecad42033f (patch) | |
| tree | f1527cbe0ece99e67ab2352f16132501d4d9a262 | |
| parent | 6456cefa0ded3d442a7bdd7e84e2ffae248ce065 (diff) | |
| download | mediagoblin-a45631e3f3791071571da3a59bf6d3ecad42033f.tar.lz mediagoblin-a45631e3f3791071571da3a59bf6d3ecad42033f.tar.xz mediagoblin-a45631e3f3791071571da3a59bf6d3ecad42033f.zip | |
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
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | mediagoblin.ini | 4 | ||||
| -rw-r--r-- | mediagoblin/config_spec.ini | 1 | ||||
| -rw-r--r-- | mediagoblin/db/sql/convert.py | 3 |
4 files changed, 7 insertions, 2 deletions
@@ -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 dbde6e51..223f0f4a 100644 --- 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 2d410899..2b4ba2f9 100644 --- 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 14a0b911..36d6fc7f 100644 --- 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) |