aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2014-10-08 14:59:18 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2014-10-10 14:42:17 -0500
commitb2624eb0fb2cc3bf409ef0457d770fb930a7d6ce (patch)
tree17d338b7c145c83c4b9d9108de25405fef816078
parent47aac7b051e73efbf3b80321d473a701d6f4c9b5 (diff)
downloadmediagoblin-b2624eb0fb2cc3bf409ef0457d770fb930a7d6ce.tar.lz
mediagoblin-b2624eb0fb2cc3bf409ef0457d770fb930a7d6ce.tar.xz
mediagoblin-b2624eb0fb2cc3bf409ef0457d770fb930a7d6ce.zip
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.
-rw-r--r--.gitignore1
-rw-r--r--Makefile.in6
-rw-r--r--mediagoblin.example.ini (renamed from mediagoblin.ini)0
3 files changed, 6 insertions, 1 deletions
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
index 7899d7ca..7899d7ca 100644
--- a/mediagoblin.ini
+++ b/mediagoblin.example.ini