aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-06-20 08:55:58 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-06-20 08:55:58 -0500
commit41f965c59d0f0673ac6e9f373e60226b3e768559 (patch)
tree0c318b48f802fe3f8f34aa0d0b3cebdaa2430404
parentfcdd172264fcc8b312fe449301471fe1761e2ed3 (diff)
downloadmediagoblin-41f965c59d0f0673ac6e9f373e60226b3e768559.tar.lz
mediagoblin-41f965c59d0f0673ac6e9f373e60226b3e768559.tar.xz
mediagoblin-41f965c59d0f0673ac6e9f373e60226b3e768559.zip
Moving server.ini->paste.ini because willkg points out server.ini is ambiguous
Updating the file, updating lazyserver.sh, updating docs.
-rw-r--r--docs/hackinghowto.rst2
-rwxr-xr-xlazyserver.sh2
-rw-r--r--paste.ini (renamed from server.ini)0
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/hackinghowto.rst b/docs/hackinghowto.rst
index b03efa91..911f2340 100644
--- a/docs/hackinghowto.rst
+++ b/docs/hackinghowto.rst
@@ -136,7 +136,7 @@ This is fine in development, but if you want to actually run celery
separately for testing (or deployment purposes), you'll want to run
the server independently::
- ./bin/paster serve server.ini --reload
+ ./bin/paster serve paste.ini --reload
Running celeryd
diff --git a/lazyserver.sh b/lazyserver.sh
index bd93b109..fdb03ba0 100755
--- a/lazyserver.sh
+++ b/lazyserver.sh
@@ -27,4 +27,4 @@ else
exit 1
fi
-CELERY_ALWAYS_EAGER=true $PASTER serve server.ini --reload
+CELERY_ALWAYS_EAGER=true $PASTER serve paste.ini --reload
diff --git a/server.ini b/paste.ini
index 73fbe8e8..73fbe8e8 100644
--- a/server.ini
+++ b/paste.ini