@@ -11,21 +11,18 @@ MANAGERS = ADMINS host = os.uname()[1] -DATABASE_ENGINE = "sqlite3" -DATABASE_NAME = "/Users/arjun/Projects/flapjax/website/persistence/sqlite3.db" - -# if host == "peabody": -# DATABASE_ENGINE = "sqlite3" -# DATABASE_NAME = "/home/arjun/Projects/flapjax/website/persistence/sqlite3.db" -# elif host == "wanderlust.local" or host == "wanderlust.brown.edu": -# DATABASE_ENGINE = "sqlite3" -# DATABASE_NAME = "/Users/arjun/Projects/flapjax/website/persistence/sqlite3.db" -# # else: # Assume deployment -# DATABASE_ENGINE = "mysql" -# DATABASE_NAME = "flapjax" -# DATABASE_USER = "flapjax" -# DATABASE_PASSWORD = "flapjax" -# + if host == "peabody": + DATABASE_ENGINE = "sqlite3" + DATABASE_NAME = "/home/arjun/Projects/flapjax/website/persistence/sqlite3.db" + elif host == "wanderlust.local" or host == "wanderlust.brown.edu": + DATABASE_ENGINE = "sqlite3" + DATABASE_NAME = "/Users/arjun/Projects/flapjax/website/persistence/sqlite3.db" + else: # Assume deployment + DATABASE_ENGINE = "mysql" + DATABASE_NAME = "flapjax" + DATABASE_USER = "flapjax" + DATABASE_PASSWORD = "flapjax" + # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. website/persistence/settings.py @@ -2,7 +2,7 @@ from django.conf.urls.defaults import * from django.conf import settings import settings -if True: # settings.host == "peabody" or settings.host == "wanderlust.local": +if settings.host == "peabody" or settings.host == "wanderlust.local": urlpatterns = patterns('', (r'^fxserver/compile/','fxserver.views.compile'), (r'^fxserver/compile_expr', 'fxserver.views.compileExpr'), website/persistence/urls.py fe40315a3fae59f21b182806b7ba27bcd335b17c Arjun Guha arjun@cs.brown.edu http://github.com/arjunguha/flapjax/commit/1fdf8c2d881a9675de362d2898c6613175ec8369 1fdf8c2d881a9675de362d2898c6613175ec8369 2009-11-02T06:21:29-08:00 2009-11-02T06:21:29-08:00 reverted DisneyWorld changes e1118919204fb0a21e56430a0819858c37a27d86 Arjun Guha arjun@cs.brown.edu