Moved common settings into common.cfg

diff --git a/beweb/beweb-start.py b/beweb/beweb-start.py
index 30c7de6a340834ed4255fe84c374f7fca6cb9d24..3f0f0a6006e8f5b4dd3111648560667c431ab9d2 100755 (executable)
--- 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 (file)
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 b705228cce87bb6a168e14a7dfd16de4bf8bcd7d..4fd8903e62b6e86cb709b31e1305600369d86f34 100644 (file)
--- 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 27c7be996309e99191bf8e5513a8be8a3d7a37f7..21eb08e99d53a4a079d7dd2e0196d987bcb65875 100644 (file)
--- 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"