diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index af3e4e69cc4af34a8cbeb62b9f895cf699923cdf..6663f3bd035420193197bddd39bd829906b53a8a 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -15,8 +15,6 @@ DATABASES = { } } -UNPREPEND_WWW = bool(int(os.environ.get("DJANGO_UNPREPEND_WWW", "0"))) - # HEROKU: Update database configuration with $DATABASE_URL. import dj_database_url db_from_env = dj_database_url.config() @@ -49,11 +47,6 @@ admin_email = os.environ.get("DJANGO_ADMIN_EMAIL", None) if admin_email is not None: ADMINS = [("Webmaster", admin_email)] - -# Use SSLRedirectMiddleware -SSL_ON = os.environ.get("DJANGO_SSL_ON", True) -SSL_ALWAYS = os.environ.get("DJANGO_SSL_ALWAYS", False) - # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html LANGUAGE_CODE = "en-us" @@ -103,14 +96,6 @@ STATICFILES_FINDERS = [ "compressor.finders.CompressorFinder", ] - -# Amazon S3 setup -DEFAULT_FILE_STORAGE = os.environ.get("DJANGO_DEFAULT_FILE_STORAGE", 'django.core.files.storage.FileSystemStorage') # noqa -AWS_ACCESS_KEY_ID = os.environ.get("DJANGO_AWS_ACCESS_KEY_ID", None) -AWS_SECRET_ACCESS_KEY = os.environ.get("DJANGO_AWS_SECRET_ACCESS_KEY", None) -AWS_STORAGE_BUCKET_NAME = os.environ.get("DJANGO_AWS_STORAGE_BUCKET_NAME", None) - - # Make this unique, and don't share it with anybody. SECRET_KEY = "6r&z0i#!k-thu4nv^zzx!f$fbp(i5mq_^%%@ihu_qxxotl_" @@ -135,7 +120,6 @@ TEMPLATES = [ "account.context_processors.account", "pinax_theme_bootstrap.context_processors.theme", "symposion.reviews.context_processors.reviews", - "sekizai.context_processors.sekizai", ], }, }, @@ -152,9 +136,6 @@ MIDDLEWARE_CLASSES = [ "django.contrib.messages.middleware.MessageMiddleware", "reversion.middleware.RevisionMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", - "ssl_redirect.middleware.SSLRedirectMiddleware", - "pinaxcon.middleware.CanonicalHostMiddleware", - "pinaxcon.middleware.UnprependWWWMiddleware", "pinaxcon.monkey_patch.MonkeyPatchMiddleware", ] @@ -181,7 +162,6 @@ INSTALLED_APPS = [ "easy_thumbnails", "taggit", "reversion", - "metron", "sitetree", "pinax.boxes", "pinax.eventlog", @@ -215,21 +195,6 @@ INSTALLED_APPS = [ "pinaxcon.proposals", "pinaxcon.registrasion", - #testing - "django_nose", - - # wiki - 'django.contrib.humanize', - 'django_nyt', - 'mptt', - 'sekizai', - #'sorl.thumbnail', - 'wiki', - 'wiki.plugins.attachments', - 'wiki.plugins.notifications', - #'wiki.plugins.images', - 'wiki.plugins.macros', - # stylesheets and js 'compressor', @@ -328,26 +293,8 @@ ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile" # in order to register. TICKET_PRODUCT_CATEGORY = 1 - INVOICE_CURRENCY = "USD" -WIKI_ACCOUNT_HANDLING = False -WIKI_ACCOUNT_SIGNUP_ALLOWED = False - -WIKI_ANONYMOUS_WRITE = False -WIKI_ANONYMOUS_UPLOAD = False - - -# Use nose to run all tests -TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' - - -# Tell nose to measure coverage on the 'foo' and 'bar' apps -NOSE_ARGS = [ - '--with-coverage', - '--cover-package=registrasion.controllers,registrasion.models', -] - MARKDOWN_DEUX_STYLES = { "default": { "safe_mode": False,