heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This commit sponsored by Loïc Grobol.  Thanks!
This commit is contained in:
Christopher Allan Webber 2014-08-10 16:27:29 -05:00 committed by Jessica Tallon
parent 2b1e0af03b
commit 98cbe47fb3
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin.ini
View File

@ -24,7 +24,7 @@ allow_registration = true
allow_reporting = true allow_reporting = true
## Uncomment this to put some user-overriding templates here ## 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 ## You can set your theme by specifying this (not specifying it will
## use the default theme). Run `gmg assetlink` to apply the change. ## use the default theme). Run `gmg assetlink` to apply the change.
@ -37,10 +37,10 @@ allow_reporting = true
user_privilege_scheme = "uploader,commenter,reporter" user_privilege_scheme = "uploader,commenter,reporter"
[storage:queuestore] [storage:queuestore]
base_dir = %(here)s/user_dev/media/queue base_dir = %(data_basedir)s/media/queue
[storage:publicstore] [storage:publicstore]
base_dir = %(here)s/user_dev/media/public base_dir = %(data_basedir)s/media/public
base_url = /mgoblin_media/ base_url = /mgoblin_media/
[celery] [celery]

19
mediagoblin/config_spec.ini
View File

@ -1,3 +1,6 @@
[DEFAULT]
data_basedir = %(here)s/user_dev
[mediagoblin] [mediagoblin]
# HTML title of the pages # HTML title of the pages
html_title = string(default="GNU MediaGoblin") html_title = string(default="GNU MediaGoblin")
@ -13,10 +16,10 @@ sql_engine = string(default="sqlite:///%(here)s/mediagoblin.db")
run_migrations = boolean(default=False) run_migrations = boolean(default=False)
# Where temporary files used in processing and etc are kept # 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 # 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 # Where mediagoblin-builtin static assets are kept
direct_remote_path = string(default="/mgoblin_static/") direct_remote_path = string(default="/mgoblin_static/")
@ -67,7 +70,7 @@ allow_reporting = boolean(default=True)
show_tos = boolean(default=False) show_tos = boolean(default=False)
# By default not set, but you might want something like: # By default not set, but you might want something like:
# "%(here)s/user_dev/templates/" # "%(data_basedir)s/templates/"
local_templates = string() local_templates = string()
# Whether or not celery is set up via an environment variable or # 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) original_date_visible = boolean(default=False)
# Theming stuff # 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_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() theme = string()
# plugin default assets directory # plugin default assets directory
plugin_web_path = string(default="/plugin_static/") 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) # Default user upload limit (in Mb)
upload_limit = integer(default=None) upload_limit = integer(default=None)
@ -123,12 +126,12 @@ extensions = string_list(default=list())
[storage:publicstore] [storage:publicstore]
storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage") 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/") base_url = string(default="/mgoblin_media/")
[storage:queuestore] [storage:queuestore]
storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage") 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] [media:medium]
# Dimensions used when creating media display images. # Dimensions used when creating media display images.