diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index ae6999e10b61ff55b5196e923fc6d935309d2d8b..83eabe8850b51ea4fc762c71cfe717285b7362e4 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -48,11 +48,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" @@ -98,13 +93,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) - try: _dynamic_storage_root = os.environ['DJANGO_DYNAMIC_STORAGE_ROOT'] except KeyError: @@ -140,7 +128,6 @@ TEMPLATES = [ "account.context_processors.account", "pinax_theme_bootstrap.context_processors.theme", "symposion.reviews.context_processors.reviews", - "sekizai.context_processors.sekizai", ], }, }, @@ -157,9 +144,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", ] @@ -186,7 +170,6 @@ INSTALLED_APPS = [ "easy_thumbnails", "taggit", "reversion", - "metron", "sitetree", "pinax.boxes", "pinax.eventlog", @@ -220,21 +203,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', @@ -344,26 +312,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,