From b2624eb0fb2cc3bf409ef0457d770fb930a7d6ce Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 8 Oct 2014 14:59:18 -0500 Subject: Users now get an editable copy of mediagoblin.example.ini->mediagoblin.ini This way we no longer have people confusedly editing mediagoblin.ini when they meant to edit mediagoblin.example.ini. Hopefully it should be a lot simpler. --- .gitignore | 1 + Makefile.in | 6 ++++- mediagoblin.example.ini | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ mediagoblin.ini | 59 ------------------------------------------------- 4 files changed, 65 insertions(+), 60 deletions(-) create mode 100644 mediagoblin.example.ini delete mode 100644 mediagoblin.ini diff --git a/.gitignore b/.gitignore index a89adcbd..851805a0 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ *.egg/ /env /paste.ini +/mediagoblin.ini # pyconfigure/automake generated files /Makefile diff --git a/Makefile.in b/Makefile.in index 4192559a..58cae88f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -81,8 +81,12 @@ installdirs i18n virtualenv all: develop -develop: $(maybe_venv_dep) i18n paste.ini +develop: $(maybe_venv_dep) i18n paste.ini mediagoblin.ini +mediagoblin.ini: + cp --no-clobber mediagoblin.example.ini mediagoblin.ini + +# We just symlink the mediagoblin from the appropriate python version paste.ini: ifeq ($(USE_PYTHON3),yes) -ln -s paste.py3.ini paste.ini diff --git a/mediagoblin.example.ini b/mediagoblin.example.ini new file mode 100644 index 00000000..7899d7ca --- /dev/null +++ b/mediagoblin.example.ini @@ -0,0 +1,59 @@ +# If you want to make changes to this file, first copy it to +# mediagoblin_local.ini, then make the changes there. +# +# If you don't see what you need here, have a look at mediagoblin/config_spec.ini +# It defines types and defaults so it’s a good place to look for documentation +# or to find hidden options that we didn’t tell you about. :) + +# To chnange the directory you should make sure you change the +# directory in paste.ini and/or your webserver configuration. +#[DEFAULT] +# data_basedir = "/path/to/data/directory" + +[mediagoblin] +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". +## Don't forget to run `./bin/gmg dbupdate` after having changed it. +# sql_engine = postgresql:///mediagoblin + +# Set to false to enable sending notices +email_debug_mode = true + +# Set to false to disable registrations +allow_registration = true + +# Set to false to disable the ability for users to report offensive content +allow_reporting = true + +## Uncomment this to put some user-overriding templates here +# 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. +## The airy and sandyseventiesspeedboat theme comes with GMG; please +## see the theming docs on how to install other themes. +# theme = airy + +## If you want the terms of service displayed, you can uncomment this +# show_tos = true + +user_privilege_scheme = "uploader,commenter,reporter" +[storage:queuestore] +base_dir = %(data_basedir)s/media/queue + +[storage:publicstore] +base_dir = %(data_basedir)s/media/public +base_url = /mgoblin_media/ + +[celery] +# Put celery stuff here + +# Place plugins here, each in their own subsection of [plugins]. +# See http://docs.mediagoblin.org/siteadmin/plugins.html for details. +[plugins] +[[mediagoblin.plugins.geolocation]] +[[mediagoblin.plugins.basic_auth]] +[[mediagoblin.media_types.image]] diff --git a/mediagoblin.ini b/mediagoblin.ini deleted file mode 100644 index 7899d7ca..00000000 --- a/mediagoblin.ini +++ /dev/null @@ -1,59 +0,0 @@ -# If you want to make changes to this file, first copy it to -# mediagoblin_local.ini, then make the changes there. -# -# If you don't see what you need here, have a look at mediagoblin/config_spec.ini -# It defines types and defaults so it’s a good place to look for documentation -# or to find hidden options that we didn’t tell you about. :) - -# To chnange the directory you should make sure you change the -# directory in paste.ini and/or your webserver configuration. -#[DEFAULT] -# data_basedir = "/path/to/data/directory" - -[mediagoblin] -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". -## Don't forget to run `./bin/gmg dbupdate` after having changed it. -# sql_engine = postgresql:///mediagoblin - -# Set to false to enable sending notices -email_debug_mode = true - -# Set to false to disable registrations -allow_registration = true - -# Set to false to disable the ability for users to report offensive content -allow_reporting = true - -## Uncomment this to put some user-overriding templates here -# 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. -## The airy and sandyseventiesspeedboat theme comes with GMG; please -## see the theming docs on how to install other themes. -# theme = airy - -## If you want the terms of service displayed, you can uncomment this -# show_tos = true - -user_privilege_scheme = "uploader,commenter,reporter" -[storage:queuestore] -base_dir = %(data_basedir)s/media/queue - -[storage:publicstore] -base_dir = %(data_basedir)s/media/public -base_url = /mgoblin_media/ - -[celery] -# Put celery stuff here - -# Place plugins here, each in their own subsection of [plugins]. -# See http://docs.mediagoblin.org/siteadmin/plugins.html for details. -[plugins] -[[mediagoblin.plugins.geolocation]] -[[mediagoblin.plugins.basic_auth]] -[[mediagoblin.media_types.image]] -- cgit v1.2.3