changed the way settings work so that remote and local both work (and I set the local version with some zsh scripts which is hacky, but it works for now

2 files changed, 155 insertions, 5 deletions

diff --git a/config/settings/settings.py b/config/settings/settings.py
index 850e232..b8560fb 100644
--- a/config/settings/settings.py
+++ b/config/settings/settings.py
@@ -1,4 +1,3 @@
-# Django settings for luxagraf.
 import os
 from os.path import dirname, abspath
 
@@ -147,8 +146,5 @@ INSTALLED_APPS = (
     'pages'
     
 )
-DEVELOPMENT = True
-if DEVELOPMENT:
-    INSTALLED_APPS += ('django_extensions',)
-    MEDIA_URL = 'http://127.0.0.1:8000/media/'
+
 
diff --git a/config/settings/settings_dev.py b/config/settings/settings_dev.py
new file mode 100644
index 0000000..a6be304
--- /dev/null
+++ b/config/settings/settings_dev.py
@@ -0,0 +1,154 @@
+# Django settings for luxagraf.
+import os
+from os.path import dirname, abspath
+
+PROJ_ROOT = abspath(dirname(dirname(dirname(__file__))))+'/'
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+    # ('Your Name', 'your_email@example.com'),
+)
+
+MANAGERS = ADMINS
+
+DATABASES = {
+    'default': {
+        'NAME': 'luxagraf',
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'USER': 'luxagraf',
+        'PASSWORD': 'translinguis',
+    }
+}
+
+TIME_ZONE = 'America/New_York'
+LANGUAGE_CODE = 'en-us'
+SITE_ID = 1
+SITE_URL = 'http://luxagraf.net/'
+GRAPPELLI_ADMIN_TITLE =  'Luxagraf Admin'
+USE_I18N = False
+USE_L10N = True
+USE_TZ = True
+
+#API key for Google Maps in Admin 
+MAP_API = "google"
+GOOGLE_MAPS_API_KEY = MAP_API_KEY = 'ABQIAAAAEZ0Oz7LFDmdS1OBHm6HLgRQT5Lr-mnFT_29u-YVgAYs_K_u6-BQ627CkPKq44oaHpmSt2497hDj_LQ'
+
+# API key for Flickr imports
+FLICKR_API_KEY = '7b9d978a440c6ab65a545adc0aa0d693'
+FLICKR_USER_ID = '85322932@N00'
+
+#path to the folder that holds the generated html files
+FLATFILES_ROOT = os.path.join(PROJ_ROOT, 'site/')
+#media and image URLs for the generated html files
+BAKED_IMAGES_URL = 'http://images.luxagraf.net/'
+BAKED_MEDIA_URL = 'http://luxagraf.net/media/'
+#BAKED_MEDIA_URL = 'http://127.0.0.1:8000/media/'
+#path to http://images.luxagraf.net root
+IMAGES_ROOT = os.path.join(PROJ_ROOT, 'site/media/images')
+IMAGES_URL = 'http://images.luxagraf.net/'
+
+# Absolute filesystem path to the directory that will hold user-uploaded files.
+# Example: "/home/media/media.lawrence.com/media/"
+MEDIA_ROOT = os.path.join(PROJ_ROOT, 'site/media')
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash.
+# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
+MEDIA_URL = 'http://127.0.0.1:8000/media/'
+
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+STATIC_ROOT = os.path.join(PROJ_ROOT, 'static/')
+
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = '/static/'
+
+# Additional locations of static files
+STATICFILES_DIRS = (
+    # Put strings here, like "/home/html/static" or "C:/www/django/static".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+)
+
+# List of finder classes that know how to find static files in
+# various locations.
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = '^gaz8-&iy8z@(nwp#xe1age(t141w-47fh=cv8a7w2=x2=a-&7'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+#     'django.template.loaders.eggs.Loader',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    # Uncomment the next line for simple clickjacking protection:
+    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.core.context_processors.request",
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.static",
+    "django.core.context_processors.tz",
+    "django.contrib.messages.context_processors.messages"
+)
+
+ROOT_URLCONF = 'config.base_urls'
+
+TEMPLATE_DIRS = (
+    os.path.join(PROJ_ROOT, 'design/templates')
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+)
+
+
+INSTALLED_APPS = (    
+    'grappelli',
+    'django.contrib.auth',
+    'django.contrib.staticfiles',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.admin',
+    'django.contrib.sitemaps',
+    'django.contrib.gis',
+    'filebrowser',
+    'locations',
+    'blog',
+    'photos',
+    'taggit',
+    'links',
+    'pagination',
+    'templatetags',
+    'projects',
+    'guide',
+    'pages'
+    
+)
+DEVELOPMENT = True
+if DEVELOPMENT:
+    INSTALLED_APPS += ('django_extensions',)
+    MEDIA_URL = 'http://127.0.0.1:8000/media/'
+