From 7e82df494ec7fdb0fe7053f9271242fa96252354 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario.Gonzalez@gmail.com>
Date: Sat, 6 Aug 2011 18:06:07 -0400
Subject: [PATCH] Updated .gitignore to ignore static folder, updated examples
 apache contrib file disabled settings.py last remaining media handling bits
 from settings.py

---
 .gitignore           | 2 ++
 contrib/apache/mayan | 2 +-
 settings.py          | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 96a43e46e6..a77e6e65b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ site_media/documents/*
 celerybeat-schedule
 document_storage/
 misc/mayan.geany
+image_cache/
+static/
diff --git a/contrib/apache/mayan b/contrib/apache/mayan
index a9a43cd2af..d07df0c188 100644
--- a/contrib/apache/mayan
+++ b/contrib/apache/mayan
@@ -13,7 +13,7 @@
     LogLevel warn
     CustomLog /var/log/apache2/mayan_access.log combined
 
-    Alias /mayan-site_media "/usr/share/mayan/mayan/site_media/"
+    Alias /mayan-static "/usr/share/mayan/mayan/static/"
     <Location "/site_media">
         SetHandler None
     </Location>
diff --git a/settings.py b/settings.py
index 4ef2abacbb..a339298c2c 100644
--- a/settings.py
+++ b/settings.py
@@ -65,14 +65,14 @@ USE_L10N = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'site_mediad/')
+#MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'site_media/')
 
 STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static/')
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/%s-site_mediad/' % PROJECT_NAME
+#MEDIA_URL = '/%s-site_media/' % PROJECT_NAME
 
 STATIC_URL = '/%s-static/' % PROJECT_NAME
 
@@ -163,7 +163,7 @@ INSTALLED_APPS = (
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.auth.context_processors.auth',
     'django.core.context_processors.i18n',
-    'django.core.context_processors.media',
+    #'django.core.context_processors.media',
     'django.core.context_processors.static',
     'django.core.context_processors.request',
 #    'django.contrib.messages.context_processors.messages',