From 56cd514030fe9f9833ce60808a79a901b0d2d824 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sat, 20 Apr 2024 07:43:43 -0400
Subject: [PATCH] Updating Sentry

---
 ansible/roles/sentry/tasks/main.yml                | 14 +++++++++++---
 ansible/roles/sentry/templates/consul_service.json |  2 +-
 apps/api/views.py                                  |  3 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/sentry/tasks/main.yml b/ansible/roles/sentry/tasks/main.yml
index 0f1eeb5df..3937e6cf5 100644
--- a/ansible/roles/sentry/tasks/main.yml
+++ b/ansible/roles/sentry/tasks/main.yml
@@ -1,14 +1,23 @@
 ---
+- name: Ensure /srv exists and is owned by user
+  become: yes
+  file:
+    path: /srv
+    state: directory
+    owner: "{{ ansible_user }}"
+    group: "{{ ansible_user }}"
+    mode: 0755
+
 - name: Pull sentry self-hosted github
   git:
     repo: https://github.com/getsentry/self-hosted.git
     dest: /srv/sentry/
-    version: master
+    version: 24.4.1
 
 - name: Updating Sentry
   command:
     chdir: /srv/sentry/
-    cmd: ./install.sh
+    cmd: ./install.sh --no-report-self-hosted-issues
 
 - name: docker-compuse up -d
   command:
@@ -24,4 +33,3 @@
   notify:
     - reload consul
   when: disable_consul_services_ie_staging is not defined
-
diff --git a/ansible/roles/sentry/templates/consul_service.json b/ansible/roles/sentry/templates/consul_service.json
index 59953fb57..0de224c1a 100644
--- a/ansible/roles/sentry/templates/consul_service.json
+++ b/ansible/roles/sentry/templates/consul_service.json
@@ -1,6 +1,6 @@
 {
     "service": {
-        "name": "{{ inventory_hostname|regex_replace('\d+', '') }}",
+        "name": "{{ inventory_hostname|regex_replace('\-?\d+', '')|regex_replace("hdb-", "db-") }}",
         "id": "{{ inventory_hostname }}",
         "tags": [
             "sentry"
diff --git a/apps/api/views.py b/apps/api/views.py
index e09230113..1c23fbe5e 100644
--- a/apps/api/views.py
+++ b/apps/api/views.py
@@ -518,6 +518,7 @@ def ip_addresses(request):
     with open('/srv/newsblur/apps/api/ip_addresses.txt', 'r') as f:
         addresses = f.read()
 
-    mail_admins(f"IP Addresses accessed from {request.META['REMOTE_ADDR']} by {request.user}", addresses)
+    if request.user.is_authenticated:
+        mail_admins(f"IP Addresses accessed from {request.META['REMOTE_ADDR']} by {request.user}", addresses)
 
     return HttpResponse(addresses, content_type='text/plain')