summaryrefslogtreecommitdiffstats
path: root/virtualenv
diff options
context:
space:
mode:
authorThomas NOEL <tnoel@entrouvert.com>2014-01-07 13:35:12 (GMT)
committerThomas NOEL <tnoel@entrouvert.com>2014-01-07 13:35:12 (GMT)
commitf74309ce81731d5a96ea6107a91bfb756b75a352 (patch)
treed899dfc91bbb9b6acbd3f7fc86ce2be07010d7c4 /virtualenv
parent71458979b4794296c7475c928fa9b7ddbea0f602 (diff)
downloadunivnautes-old-f74309ce81731d5a96ea6107a91bfb756b75a352.zip
univnautes-old-f74309ce81731d5a96ea6107a91bfb756b75a352.tar.gz
univnautes-old-f74309ce81731d5a96ea6107a91bfb756b75a352.tar.bz2
pfidp: update settings.py
Diffstat (limited to 'virtualenv')
-rw-r--r--virtualenv/pfidp/settings.py18
1 files changed, 11 insertions, 7 deletions
diff --git a/virtualenv/pfidp/settings.py b/virtualenv/pfidp/settings.py
index 7c14261..0eb9ba4 100644
--- a/virtualenv/pfidp/settings.py
+++ b/virtualenv/pfidp/settings.py
@@ -6,7 +6,6 @@ gettext_noop = lambda s: s
DEBUG = False
LOG_DEBUG = False
-STATIC_SERVE = True
TEMPLATE_DEBUG = DEBUG
_PROJECT_PATH = os.path.join(os.path.dirname(__file__))
@@ -17,9 +16,12 @@ _PROJECT_PATH = os.path.join(os.path.dirname(__file__))
ADMINS = (
# ('Your Name', 'your_email@domain.com'),
)
-
MANAGERS = ADMINS
+# Hosts/domain names that are valid for this site; required if DEBUG is False
+# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
+ALLOWED_HOSTS = ['*']
+
_DATABASE_NAME = os.path.join(_PROJECT_PATH, 'pfidp.db')
DATABASES = {
'default': {
@@ -28,9 +30,6 @@ DATABASES = {
}
}
-# /media is handled by this project
-STATIC_SERVE = True
-
# fastcgi (see http://docs.djangoproject.com/en/dev/howto/deployment/fastcgi/)
FORCE_SCRIPT_NAME=""
@@ -76,6 +75,11 @@ MEDIA_ROOT = os.path.join(_PROJECT_PATH, 'media')
# Examples: "http://media.lawrence.com", "http://example.com/media/"
MEDIA_URL = '/media/'
+# Static files (see server.document-root in lighttpd configuration)
+STATIC_ROOT = '/usr/local/univnautes/www/static'
+STATIC_URL = '/static/'
+
+
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
@@ -118,12 +122,12 @@ TEMPLATE_DIRS = (
)
INSTALLED_APPS = (
+ 'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
- 'django.contrib.admin',
- 'django.contrib.sites',
+ 'django.contrib.staticfiles',
'authentic2.saml',
'authentic2.idp',
'authentic2.attribute_aggregator',