Try fix deployment

adlibre · Apr 16, 2012 · 0c46ac3 · 0c46ac3
1 parent d234897
commit 0c46ac3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 27 deletions.
diff --git a/settings.py → adlibre_tms/local_settings.py b/settings.py → adlibre_tms/local_settings.py
@@ -1,8 +1,20 @@
-from adlibre_tms import settings
+#### Database Location ../db/
+
+import os
+
+PROJECT_PATH = os.path.abspath(os.path.split(__file__)[0])
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(PROJECT_PATH, '..', 'db', 'tms.sqlite'),
+        }
+}
+###
 
 ADMINS = (
-    #('Admin', 'admin@example.com'),
-    )
+#('Admin', 'admin@example.com'),
+)
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'change me'
@@ -17,17 +29,4 @@
 # Turn off demo
 DEMO = False
 
-##########
-
-import os
-
-PROJECT_PATH = os.path.abspath(os.path.split(__file__)[0])
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(PROJECT_PATH, '..', 'db', 'tms.sqlite'),
-        }
-}
 
-print PROJECT_PATH
diff --git a/adlibre_tms/settings.py b/adlibre_tms/settings.py
@@ -23,12 +23,12 @@
 # tells django to serve media through django.views.static.serve.
 SERVE_MEDIA = DEBUG
 
-#DATABASES = {
-#    'default': {
-#        'ENGINE': 'django.db.backends.sqlite3',
-#        'NAME': os.path.join(PROJECT_PATH, '..', '..', 'db', 'tms.sqlite'),
-#    }
-#}
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(PROJECT_PATH, '..', '..', 'db', 'tms.sqlite'),
+    }
+}
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -143,17 +143,14 @@
     'django.contrib.admin',
     'django.contrib.sitemaps',
     #'django.contrib.flatpages',
-    #for Django 1.3
     'django.contrib.staticfiles',
 
     # external
     'uni_form',
+    'pagination',
 
-    # for Django 1.2.1
-    #'staticfiles',
     # Compresses CSS/JS files from media/static
     "compressor",
-    'pagination',
 
     # local
     'accounts',

diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@ def find_packages(path, base="" ):
     data_files = [
             ('db', ['db/.gitignore']),
             ('deployment', glob.glob('deployment/*')),
-            ('adlibre_tms', ['settings.py', 'adlibre_tms/manage.py']),
+            ('adlibre_tms', ['adlibre_tms/local_settings.py', 'adlibre_tms/manage.py']),
         ],
     install_requires=[
             'BeautifulSoup==3.2.0',