Updated config_spec.ini to add %(data_basedir)s and make use of it!

This commit sponsored by Loïc Grobol.  Thanks!

diff --git a/mediagoblin.ini b/mediagoblin.ini
index 5e2477a4b533588839240fd278b3053d6c7d8bce..de4d2c8521a6def432d712ae141d654a4b32309a 100644 (file)
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -24,7 +24,7 @@ allow_registration = true
 allow_reporting = true
 
 ## Uncomment this to put some user-overriding templates here
-# local_templates = %(here)s/user_dev/templates/
+# local_templates = %(data_basedir)s/templates/
 
 ## You can set your theme by specifying this (not specifying it will
 ## use the default theme).  Run `gmg assetlink` to apply the change.
@@ -37,10 +37,10 @@ allow_reporting = true
 
 user_privilege_scheme = "uploader,commenter,reporter"
 [storage:queuestore]
-base_dir = %(here)s/user_dev/media/queue
+base_dir = %(data_basedir)s/media/queue
 
 [storage:publicstore]
-base_dir = %(here)s/user_dev/media/public
+base_dir = %(data_basedir)s/media/public
 base_url = /mgoblin_media/
 
 [celery]

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index f3f3f7ab1783947dbb0e7619cf97c9749bffcaa4..dade8420046d0f865788cde3566b0c539b6dd463 100644 (file)
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -1,3 +1,6 @@
+[DEFAULT]
+data_basedir = %(here)s/user_dev
+
 [mediagoblin]
 # HTML title of the pages
 html_title = string(default="GNU MediaGoblin")
@@ -13,10 +16,10 @@ sql_engine = string(default="sqlite:///%(here)s/mediagoblin.db")
 run_migrations = boolean(default=False)
 
 # Where temporary files used in processing and etc are kept
-workbench_path = string(default="%(here)s/user_dev/media/workbench")
+workbench_path = string(default="%(data_basedir)s/media/workbench")
 
 # Where to store cryptographic sensible data
-crypto_path = string(default="%(here)s/user_dev/crypto")
+crypto_path = string(default="%(data_basedir)s/crypto")
 
 # Where mediagoblin-builtin static assets are kept
 direct_remote_path = string(default="/mgoblin_static/")
@@ -67,7 +70,7 @@ allow_reporting = boolean(default=True)
 show_tos = boolean(default=False)
 
 # By default not set, but you might want something like:
-# "%(here)s/user_dev/templates/"
+# "%(data_basedir)s/templates/"
 local_templates = string()
 
 # Whether or not celery is set up via an environment variable or
@@ -90,14 +93,14 @@ exif_visible = boolean(default=False)
 original_date_visible = boolean(default=False)
 
 # Theming stuff
-theme_install_dir = string(default="%(here)s/user_dev/themes/")
+theme_install_dir = string(default="%(data_basedir)s/themes/")
 theme_web_path = string(default="/theme_static/")
-theme_linked_assets_dir = string(default="%(here)s/user_dev/theme_static/")
+theme_linked_assets_dir = string(default="%(data_basedir)s/theme_static/")
 theme = string()
 
 # plugin default assets directory
 plugin_web_path = string(default="/plugin_static/")
-plugin_linked_assets_dir = string(default="%(here)s/user_dev/plugin_static/")
+plugin_linked_assets_dir = string(default="%(data_basedir)s/plugin_static/")
 
 # Default user upload limit (in Mb)
 upload_limit = integer(default=None)
@@ -123,12 +126,12 @@ extensions = string_list(default=list())
 
 [storage:publicstore]
 storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage")
-base_dir = string(default="%(here)s/user_dev/media/public")
+base_dir = string(default="%(data_basedir)s/media/public")
 base_url = string(default="/mgoblin_media/")
 
 [storage:queuestore]
 storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage")
-base_dir = string(default="%(here)s/user_dev/media/queue")
+base_dir = string(default="%(data_basedir)s/media/queue")
 
 [media:medium]
 # Dimensions used when creating media display images.