Separate var dir.

diff --git a/.gitignore b/.gitignore
index 554bc70..0c8943b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,9 @@
 localsettings.py
 localsettings.py

-dev.sqlite
-*.db
-*.db-journal
+var

 *~
 *.orig
 *.log
 
 *~
 *.orig
 *.log
 

-# Compress output
-/static
-

 # Python garbage
 *.pyc
 .coverage
 # Python garbage
 *.pyc
 .coverage


@@ -33,7 +28,5 @@ thumbs.db
 # Tags file
 TAGS
 
 # Tags file
 TAGS
 

-media
-search_index

 .sass-cache
 
 .sass-cache
 

diff --git a/src/project_name/settings/basic.py b/src/project_name/settings/basic.py
index 65bfd83..da47145 100644 (file)
--- a/src/project_name/settings/basic.py
+++ b/src/project_name/settings/basic.py
@@ -8,7 +8,7 @@ TEMPLATE_DEBUG = DEBUG
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.

-        'NAME': path.join(PROJECT_DIR, 'dev.db'),                      # Or path to database file if using sqlite3.
+        'NAME': path.join(PROJECT_DIR, 'var', 'dev.db'),                      # Or path to database file if using sqlite3.

         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.

diff --git a/src/project_name/settings/paths.py b/src/project_name/settings/paths.py
index b3ef304..3b1a69e 100644 (file)
--- a/src/project_name/settings/paths.py
+++ b/src/project_name/settings/paths.py
@@ -1,3 +1,3 @@
 from os import path
 
 from os import path
 

-PROJECT_DIR = path.dirname(path.abspath(path.dirname(__file__)))
+PROJECT_DIR = path.dirname(path.dirname(path.dirname(path.abspath(path.dirname(__file__)))))

diff --git a/src/project_name/settings/static.py b/src/project_name/settings/static.py
index 23f305e..d506058 100644 (file)
--- a/src/project_name/settings/static.py
+++ b/src/project_name/settings/static.py
@@ -2,9 +2,9 @@ from os import path
 from paths import PROJECT_DIR
 
 
 from paths import PROJECT_DIR
 
 

-MEDIA_ROOT = path.join(PROJECT_DIR, 'media/')
+MEDIA_ROOT = path.join(PROJECT_DIR, 'var/media/')

 MEDIA_URL = '/media/'
 MEDIA_URL = '/media/'

-STATIC_ROOT = path.join(PROJECT_DIR, 'static/')
+STATIC_ROOT = path.join(PROJECT_DIR, 'var/static/')

 STATIC_URL = '/static/'
 
 STATICFILES_FINDERS = (
 STATIC_URL = '/static/'
 
 STATICFILES_FINDERS = (