File diff c6314ae230da → 1886323d7431
pinaxcon/settings.py
Show inline comments
...
 
@@ -2,9 +2,11 @@ import os
 
import saml2
 
import saml2.saml
 
from django.utils.crypto import get_random_string
 
import django
 

	
 
PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
 
PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
 
DJANGO_ROOT = os.path.abspath(os.path.dirname(django.__file__))
 
BASE_DIR = PACKAGE_ROOT
 

	
 

	
...
 
@@ -21,7 +23,6 @@ EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
THEME_CONTACT_EMAIL = "team@lca2018.org"
 
SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY", get_random_string(length=64))
 

	
 

	
 
PINAX_STRIPE_PUBLIC_KEY = os.environ.get("STRIPE_PUBLIC_KEY", "your test public key")
 
PINAX_STRIPE_SECRET_KEY = os.environ.get("STRIPE_SECRET_KEY", "your test secret key")
 
PINAX_STRIPE_SEND_EMAIL_RECEIPTS = False
...
 
@@ -34,7 +35,7 @@ smal2_sp_slo_post = 'http://example.com/saml2/ls/post'
 
saml2_base_dir = os.path.join(PACKAGE_ROOT, 'saml2')
 
saml2_idp_metadata = {
 
    'local': [os.path.join(saml2_base_dir, 'remote_metadata.xml')],
 
    },
 
    }
 
saml2_signing_key = os.path.join(saml2_base_dir, 'cert.key')
 
saml2_signing_crt = os.path.join(saml2_base_dir, 'cert.pem')
 
saml2_encr_key = os.path.join(saml2_base_dir, 'enc.key')
...
 
@@ -71,7 +72,7 @@ USE_TZ = True
 
MEDIA_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "media")
 
MEDIA_URL = "/site_media/media/"
 

	
 
STATIC_ROOT = os.path.join(PROJECT_ROOT, "static", "distx")
 
STATIC_ROOT = os.path.join(PROJECT_ROOT, "static")
 
STATIC_URL = "/static/dist/"
 

	
 
STATICFILES_DIRS = [
...
 
@@ -83,11 +84,13 @@ STATICFILES_FINDERS = [
 
    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
 
]
 

	
 
FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'
 
TEMPLATES = [
 
    {
 
        "BACKEND": "django.template.backends.django.DjangoTemplates",
 
        "DIRS": [
 
            os.path.join(PACKAGE_ROOT, "templates"),
 
            os.path.join(DJANGO_ROOT, 'forms/templates')
 
        ],
 
        "APP_DIRS": True,
 
        "OPTIONS": {