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.

diff --git a/.gitignore b/.gitignore
index a89adcbd447db6f447de7d6ad2f9d5f09316cafd..851805a09db222cc4afe9a9a55218a6b90ccc9c5 100644 (file)
--- 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 4192559a8c08804fb8e08d5b01ac0865c43317aa..58cae88fc31531c2e894f209632e1b03a693463f 100644 (file)
--- 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