From b2624eb0fb2cc3bf409ef0457d770fb930a7d6ce Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 8 Oct 2014 14:59:18 -0500 Subject: [PATCH] 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.ini => mediagoblin.example.ini | 0 3 files changed, 6 insertions(+), 1 deletion(-) rename mediagoblin.ini => mediagoblin.example.ini (100%) 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.ini b/mediagoblin.example.ini similarity index 100% rename from mediagoblin.ini rename to mediagoblin.example.ini -- 2.25.1