Updated .gitignore to ignore static folder, updated examples apache contrib file
disabled settings.py last remaining media handling bits from settings.py
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -9,3 +9,5 @@ site_media/documents/*
|
||||
celerybeat-schedule
|
||||
document_storage/
|
||||
misc/mayan.geany
|
||||
image_cache/
|
||||
static/
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user