Merge branch 'main' into doc-validator

1 files changed, 20 insertions, 28 deletions

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 2c87007c..300452fa 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -20,6 +20,7 @@ import sentry_sdk
 from django.contrib.messages import constants as messages
 from sentry_sdk.integrations.django import DjangoIntegration
 
+from pydis_site.constants import GIT_SHA
 
 if typing.TYPE_CHECKING:
     from django.contrib.auth.models import User
@@ -27,13 +28,14 @@ if typing.TYPE_CHECKING:
 
 env = environ.Env(
     DEBUG=(bool, False),
-    SITE_SENTRY_DSN=(str, "")
+    SITE_DSN=(str, "")
 )
 
 sentry_sdk.init(
-    dsn=env('SITE_SENTRY_DSN'),
+    dsn=env('SITE_DSN'),
     integrations=[DjangoIntegration()],
-    send_default_pii=True
+    send_default_pii=True,
+    release=f"site@{GIT_SHA}"
 )
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -45,21 +47,7 @@ DEBUG = env('DEBUG')
 
 # SECURITY WARNING: keep the secret key used in production secret!
 if DEBUG:
-    ALLOWED_HOSTS = env.list(
-        'ALLOWED_HOSTS',
-        default=[
-            'pythondiscord.local',
-            'api.pythondiscord.local',
-            'admin.pythondiscord.local',
-            'staff.pythondiscord.local',
-            '0.0.0.0',  # noqa: S104
-            'localhost',
-            'web',
-            'api.web',
-            'admin.web',
-            'staff.web'
-        ]
-    )
+    ALLOWED_HOSTS = env.list('ALLOWED_HOSTS', default=['*'])
     SECRET_KEY = "yellow polkadot bikini"  # noqa: S105
 
 elif 'CI' in os.environ:
@@ -74,10 +62,7 @@ else:
             'admin.pythondiscord.com',
             'api.pythondiscord.com',
             'staff.pythondiscord.com',
-            'pydis.com',
-            'api.pydis.com',
-            'admin.pydis.com',
-            'staff.pydis.com',
+            'pydis-api.default.svc.cluster.local',
         ]
     )
     SECRET_KEY = env('SECRET_KEY')
@@ -157,8 +142,8 @@ TEMPLATES = [
                 'django.template.context_processors.static',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-
                 "sekizai.context_processors.sekizai",
+                "pydis_site.context_processors.git_sha_processor"
             ],
         },
     },
@@ -170,7 +155,8 @@ WSGI_APPLICATION = 'pydis_site.wsgi.application'
 # https://docs.djangoproject.com/en/2.1/ref/settings/#databases
 
 DATABASES = {
-    'default': env.db()
+    'default': env.db(),
+    'metricity': env.db('METRICITY_DB_URL'),
 }
 
 # Password validation
@@ -258,14 +244,11 @@ LOGGING = {
     'handlers': {
         'console': {
             'class': 'logging.StreamHandler'
-        },
-        'database': {
-            'class': 'pydis_site.apps.api.dblogger.DatabaseLogHandler'
         }
     },
     'loggers': {
         'django': {
-            'handlers': ['console', 'database'],
+            'handlers': ['console'],
             'propagate': True,
             'level': env(
                 'LOG_LEVEL',
@@ -392,6 +375,7 @@ AUTHENTICATION_BACKENDS = (
 ACCOUNT_ADAPTER = "pydis_site.utils.account.AccountAdapter"
 ACCOUNT_EMAIL_REQUIRED = False       # Undocumented allauth setting; don't require emails
 ACCOUNT_EMAIL_VERIFICATION = "none"  # No verification required; we don't use emails for anything
+ACCOUNT_DEFAULT_HTTP_PROTOCOL = "https"
 
 # We use this validator because Allauth won't let us actually supply a list with no validators
 # in it, and we can't just give it a lambda - that'd be too easy, I suppose.
@@ -399,3 +383,11 @@ ACCOUNT_USERNAME_VALIDATORS = "pydis_site.VALIDATORS"
 
 LOGIN_REDIRECT_URL = "home"
 SOCIALACCOUNT_ADAPTER = "pydis_site.utils.account.SocialAccountAdapter"
+SOCIALACCOUNT_PROVIDERS = {
+    "discord": {
+        "SCOPE": [
+            "identify",
+        ],
+        "AUTH_PARAMS": {"prompt": "none"}
+    }
+}