From: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Tue, 6 Dec 2005 19:09:53 +0000 (-0500)
Subject: Moved common settings into common.cfg
X-Git-Tag: 1.0.0~261
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f678c4e0ba791054216cdb9fb25d1ccfd706737;p=be.git

Moved common settings into common.cfg
---

diff --git a/beweb/beweb-start.py b/beweb/beweb-start.py
index 30c7de6..3f0f0a6 100755
--- a/beweb/beweb-start.py
+++ b/beweb/beweb-start.py
@@ -10,6 +10,7 @@ import sys
 # if it's not on the command line, then
 # look for setup.py in this directory. If it's not there, this script is
 # probably installed
+cherrypy.config.update(file="common.cfg")
 if len(sys.argv) > 1:
     cherrypy.config.update(file=sys.argv[1])
 elif exists(join(dirname(__file__), "setup.py")):
diff --git a/beweb/common.cfg b/beweb/common.cfg
new file mode 100644
index 0000000..50febb5
--- /dev/null
+++ b/beweb/common.cfg
@@ -0,0 +1,7 @@
+# This is where all of your settings go for your development environment
+[/static]
+staticFilter.on = True
+staticFilter.dir = "static"
+[/favicon.ico]
+staticFilter.on = True
+staticFilter.file = "static/images/favicon.ico"
diff --git a/beweb/dev.cfg b/beweb/dev.cfg
index b705228..4fd8903 100644
--- a/beweb/dev.cfg
+++ b/beweb/dev.cfg
@@ -32,10 +32,3 @@
 
 server.environment="development"
 autoreload.package="beweb"
-
-[/static]
-staticFilter.on = True
-staticFilter.dir = "static"
-[/favicon.ico]
-staticFilter.on = True
-staticFilter.file = "static/images/favicon.ico"
diff --git a/beweb/prod.cfg b/beweb/prod.cfg
index 27c7be9..21eb08e 100644
--- a/beweb/prod.cfg
+++ b/beweb/prod.cfg
@@ -31,6 +31,3 @@ server.logToScreen=False
 # to the TurboGears instance here
 # server.webpath=""
 
-[/static]
-staticFilter.on = True
-staticFilter.dir = "static"