Merge branch 'master' into bug/backend/s329/docker-compose-tty

5 files changed, 23 insertions, 6 deletions

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 65ef2463..5f80a414 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -16,14 +16,24 @@ import sys
 import typing
 
 import environ
+import sentry_sdk
 from django.contrib.messages import constants as messages
+from sentry_sdk.integrations.django import DjangoIntegration
+
 
 if typing.TYPE_CHECKING:
     from django.contrib.auth.models import User
     from wiki.models import Article
 
 env = environ.Env(
-    DEBUG=(bool, False)
+    DEBUG=(bool, False),
+    SITE_SENTRY_DSN=(str, "")
+)
+
+sentry_sdk.init(
+    dsn=env('SITE_SENTRY_DSN'),
+    integrations=[DjangoIntegration()],
+    send_default_pii=True
 )
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -197,7 +207,7 @@ STATICFILES_DIRS = [os.path.join(BASE_DIR, 'pydis_site', 'static')]
 STATIC_ROOT = env('STATIC_ROOT', default='/app/staticfiles')
 
 MEDIA_URL = '/media/'
-MEDIA_ROOT = env('MEDIA_ROOT', default='/app/media')
+MEDIA_ROOT = env('MEDIA_ROOT', default='/site/media')
 
 STATICFILES_FINDERS = [
     'django.contrib.staticfiles.finders.FileSystemFinder',
diff --git a/pydis_site/static/images/sponsors/adafruit.png b/pydis_site/static/images/sponsors/adafruit.png
index 27cd9953..eb14cf5d 100644
--- a/pydis_site/static/images/sponsors/adafruit.png
+++ b/pydis_site/static/images/sponsors/adafruit.png
diff --git a/pydis_site/static/images/sponsors/jetbrains.png b/pydis_site/static/images/sponsors/jetbrains.png
index 0b21c2c8..b79e110a 100644
--- a/pydis_site/static/images/sponsors/jetbrains.png
+++ b/pydis_site/static/images/sponsors/jetbrains.png
diff --git a/pydis_site/static/images/sponsors/sentry.png b/pydis_site/static/images/sponsors/sentry.png
new file mode 100644
index 00000000..ce185da2
--- /dev/null
+++ b/pydis_site/static/images/sponsors/sentry.png
diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html
index 3b150767..1ee93b10 100644
--- a/pydis_site/templates/home/index.html
+++ b/pydis_site/templates/home/index.html
@@ -37,11 +37,15 @@
           </p>
         </div>
 
-        {# Code Jam banner #}
+        {# Right column container #}
         <div class="column is-half-desktop video-container">
-          <a href="https://pythondiscord.com/pages/code-jams/code-jam-6/">
-            <img src="https://raw.githubusercontent.com/python-discord/branding/master/logos/logo_discord_banner/code%20jam%206%20-%20website%20banner.png"/>
-          </a>
+          <iframe
+              width="560"
+              height="315"
+              src="https://www.youtube.com/embed/I97L_Y3rhvc?start=381"
+              frameborder="0"
+              allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen>
+          </iframe>
         </div>
       </div>
 
@@ -92,6 +96,9 @@
           <a href="https://adafruit.com" class="column is-narrow">
             <img src="{% static "images/sponsors/adafruit.png" %}" alt="Adafruit"/>
           </a>
+          <a href="https://sentry.io" class="column is-narrow">
+            <img src="{% static "images/sponsors/sentry.png" %}" alt="Sentry"/>
+          </a>
         </div>
       </div>
     </div>