Browse files

improved setup settings for production

  • Loading branch information...
1 parent d2d6d9d commit 878c477dad1ce72b8e4d0a0791dec2c16edddceb Eugen committed Aug 18, 2010
Showing with 4 additions and 9 deletions.
  1. +1 −2 .gitignore
  2. +3 −1 simblin.wsgi
  3. +0 −6 simblin/__init__.py
View
3 .gitignore
@@ -1,5 +1,4 @@
-syntax: glob
env/
*.db
-settings.cfg
+settings.py
distribute-0.6.10.tar.gz
View
4 simblin.wsgi
@@ -8,7 +8,9 @@ site.addsitedir("/var/www/blog/env/lib/python2.5/site-packages")
BASE_DIR = os.path.join(os.path.dirname(__file__))
sys.path.append(BASE_DIR)
+
+import settings
from simblin import create_app
-application = create_app()
+application = create_app(settings)
View
6 simblin/__init__.py
@@ -20,14 +20,8 @@ def create_app(config=None):
app = Flask(__name__)
app.config.from_pyfile('default-settings.cfg')
- try:
- app.config.from_pyfile('../settings.cfg')
- except IOError:
- pass
-
app.config.from_envvar('SIMBLIN_SETTINGS', silent=True)
- # Specially for unit tests
if config:
app.config.from_object(config)

0 comments on commit 878c477

Please sign in to comment.