projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change complimentary_task to complementary_tas
[mediagoblin.git]
/
mediagoblin
/
config_spec.ini
diff --git
a/mediagoblin/config_spec.ini
b/mediagoblin/config_spec.ini
index b5c957c8acba8a17cdcc5d17dcea41b59ad3e856..c696c32796f221c0d836c228954e3e41d67ef06f 100644
(file)
--- a/
mediagoblin/config_spec.ini
+++ b/
mediagoblin/config_spec.ini
@@
-1,9
+1,12
@@
+[DEFAULT]
+data_basedir = %(here)s/user_dev
+
[mediagoblin]
# HTML title of the pages
html_title = string(default="GNU MediaGoblin")
# link to source for this MediaGoblin site
[mediagoblin]
# HTML title of the pages
html_title = string(default="GNU MediaGoblin")
# link to source for this MediaGoblin site
-source_link = string(default="https://
gitorious.org/mediagoblin/
mediagoblin")
+source_link = string(default="https://
savannah.gnu.org/git/?group=
mediagoblin")
# database stuff
sql_engine = string(default="sqlite:///%(here)s/mediagoblin.db")
# database stuff
sql_engine = string(default="sqlite:///%(here)s/mediagoblin.db")
@@
-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
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
# 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/")
# 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:
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
local_templates = string()
# Whether or not celery is set up via an environment variable or
@@
-83,6
+86,9
@@
allow_attachments = boolean(default=False)
# Cookie stuff
csrf_cookie_name = string(default='mediagoblin_csrftoken')
# Cookie stuff
csrf_cookie_name = string(default='mediagoblin_csrftoken')
+# Set to true to prevent browsers leaking information through Referrers
+no_referrer = boolean(default=True)
+
# Push stuff
push_urls = string_list(default=list())
# Push stuff
push_urls = string_list(default=list())
@@
-90,14
+96,14
@@
exif_visible = boolean(default=False)
original_date_visible = boolean(default=False)
# Theming stuff
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_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/")
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)
# Default user upload limit (in Mb)
upload_limit = integer(default=None)
@@
-121,12
+127,12
@@
extensions = string_list(default=list())
[storage:publicstore]
storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage")
[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_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.
[media:medium]
# Dimensions used when creating media display images.
@@
-147,8
+153,8
@@
CELERY_RESULT_BACKEND = string(default="database")
CELERY_RESULT_DBURI = string(default="sqlite:///%(here)s/celery.db")
# default kombu stuff
CELERY_RESULT_DBURI = string(default="sqlite:///%(here)s/celery.db")
# default kombu stuff
-BROKER_
TRANSPORT = string(default="sqlalchemy
")
-
BROKER_URL = string(default="sqlite:///%(here)s/kombu.db
")
+BROKER_
URL = string(default="amqp://
")
+
CELERY_DEFAULT_QUEUE = string(default="default
")
# known booleans
CELERY_RESULT_PERSISTENT = boolean()
# known booleans
CELERY_RESULT_PERSISTENT = boolean()
@@
-160,7
+166,7
@@
CELERY_EAGER_PROPAGATES_EXCEPTIONS = boolean()
CELERY_IGNORE_RESULT = boolean()
CELERY_TRACK_STARTED = boolean()
CELERY_DISABLE_RATE_LIMITS = boolean()
CELERY_IGNORE_RESULT = boolean()
CELERY_TRACK_STARTED = boolean()
CELERY_DISABLE_RATE_LIMITS = boolean()
-CELERY_ACKS_LATE = boolean()
+CELERY_ACKS_LATE = boolean(
default=True
)
CELERY_STORE_ERRORS_EVEN_IF_IGNORED = boolean()
CELERY_SEND_TASK_ERROR_EMAILS = boolean()
CELERY_SEND_EVENTS = boolean()
CELERY_STORE_ERRORS_EVEN_IF_IGNORED = boolean()
CELERY_SEND_TASK_ERROR_EMAILS = boolean()
CELERY_SEND_EVENTS = boolean()
@@
-169,8
+175,8
@@
CELERYD_LOG_COLOR = boolean()
CELERY_REDIRECT_STDOUTS = boolean()
# known ints
CELERY_REDIRECT_STDOUTS = boolean()
# known ints
-CELERYD_CONCURRENCY = integer()
-CELERYD_PREFETCH_MULTIPLIER = integer()
+CELERYD_CONCURRENCY = integer(
default=1
)
+CELERYD_PREFETCH_MULTIPLIER = integer(
default=1
)
CELERY_AMQP_TASK_RESULT_EXPIRES = integer()
CELERY_AMQP_TASK_RESULT_CONNECTION_MAX = integer()
REDIS_PORT = integer()
CELERY_AMQP_TASK_RESULT_EXPIRES = integer()
CELERY_AMQP_TASK_RESULT_CONNECTION_MAX = integer()
REDIS_PORT = integer()