From 10ba5b84e42ea4cbacdb18e5be4af211c520e359 Mon Sep 17 00:00:00 2001
From: Disco DeDisco <adamcraighamilton@gmail.com>
Date: Sat, 7 Feb 2026 18:58:17 -0500
Subject: [PATCH] after many diversions and forlorn pivot from copilot to
 claude, new infra/ structure contains group_vars and ansible vaults; requests
 added to dev and prod dependencies; apps.lyric.views and core .settings both
 abandon django's send_mail(); instead incorporate requests to target
 Mailgun's HTTP API (DigitalOcean's SMTP blocker thwarted previous magic login
 link email attempts, but this issue has been resol ved with this commit)

---
 container.db.sqlite3                   | Bin 106496 -> 106496 bytes
 infra/deploy-playbook.yaml             |  12 +++++++++---
 infra/group_vars/production/vault.yaml |  22 ++++++++++++++++++++++
 infra/group_vars/staging/vault.yaml    |  22 ++++++++++++++++++++++
 infra/inventory.ini                    |   7 +++++++
 requirements.dev.txt                   | Bin 1124 -> 531 bytes
 requirements.txt                       |   1 +
 src/apps/lyric/views.py                |  23 +++++++++++++++++------
 src/core/settings.py                   |   5 ++++-
 9 files changed, 82 insertions(+), 10 deletions(-)
 create mode 100644 infra/group_vars/production/vault.yaml
 create mode 100644 infra/group_vars/staging/vault.yaml
 create mode 100644 infra/inventory.ini

diff --git a/container.db.sqlite3 b/container.db.sqlite3
index d95a78b3e739862653374aec1ce3a52fb4cf4a3d..f2dafaff89d4b6e0c978c3eb9245edf5b0b31a37 100644
GIT binary patch
delta 893
zcmah{J#W)c6t(MoNFezIMnEM}Kei_C`}t)Eq#4qx3at<->O^cmJ2;IS9HO*Ef)oa_
zHd(^RP$AX`p{$V@_z`r1g<nzOFjYb%%U$j{_ug~vIh&@=rm6G0Iv?CC>-=r)Yfb-r
zKVjxUW*n`UqkK;PwQeM<?}E~+Ch{%ZARW;@IX!MPk6TSby8-iGxE<HSM<Xk*zu9lK
zeWwt)s=gzFy{89{ce?aR!?Wam$indOP@OiqCwtpv?0b*4pS|2Vz!38dh&M3GVp71g
zz*tU5$tb!3F0~~v)W8G`$I*MRwrW)MMMoH;$pd{Yp=sLcAj%FiiQ8$jqJb&sg9=ES
z-_5>R8Ar(M71Kt!YAZW*+jdZYZihj$(>i)s5AC3tb6X+7%Jm_}N(w}w#UyqVl!9=Z
zA%{p(OwH$0n{g@yMFe8Xl<Qd7fr3NHY=|7*L&fC$0Z<_X9bY+~RMhw5y_hTMGAOLL
zdbF6B&-VzE9wbT<MJTcyDJl05LkL-1iA`k{jrjwp%dt|fMJN=MD$n*IgDzx_&pkmX
zoAh_}*O}PgD-B$NE%OSjfMNWsa2)+Md$VUP@-RIEEiekDW}ro8Bxj)Oii`hBR#xKg
zz6G+38EEuzSI<s<wDk4NP4F|0;e`gifr~G<Y9GMnvQg6iA6w&k8;LAN1q=%W<v8Pl
QSW9s<mj|UgpU(BnA69GpT>t<8

delta 349
zcmZoTz}9epZGtqT_Cy(HM(xIgtqF`P<XQLy`1CgxD)UX(*JFIF#>nd1l<8QJZ()#G
zSZ1DUnQM@0Qfi!BV4j+kWn65OR#BO4VV*tRLZ7iNEYH`>&?>$%Cp9H8**!nF+&wom
zzFaplGTqnI-PJKtH^?|B$ur;0Dbp+4sKUh4)5yTcOxM6j*U((S(9+7t(#q6a&&<fk
z(#VjDfq{XEe>(&JcK$n?1rt{DPv36OsA{0h?8`~WDZF5<?F{?}_}e!YR`YLf_h+mX
z-~gL;hkrZRG!_+RU&iSR{23Lt-_B=L6W|8xIn2QSi2pE9!FGOIIc7&jB<C3!S{WHw
b85`=EnVOj!TQJEoJ8~jPqq%<B1V#Y>-KJlX

diff --git a/infra/deploy-playbook.yaml b/infra/deploy-playbook.yaml
index 1e7c9ad..d5232ae 100644
--- a/infra/deploy-playbook.yaml
+++ b/infra/deploy-playbook.yaml
@@ -1,6 +1,10 @@
-- hosts: all
+- hosts: staging
 
   tasks:
+    - name: Debug django_allowed_host
+      debug:
+        var: django_allowed_host
+
     - name: Install docker
       ansible.builtin.apt:
         name: docker.io
@@ -78,9 +82,11 @@
         env:
           DJANGO_DEBUG_FALSE: "1"
           DJANGO_SECRET_KEY: "{{ secret_key.content | b64decode }}"
-          DJANGO_ALLOWED_HOST: "localhost,staging.earthmanrpg.me,www.earthmanrpg.me,dashboard.earthmanrpg.me,earthmanrpg.me,167.172.29.172"
+          DJANGO_ALLOWED_HOST: "{{ django_allowed_host }}"
           DJANGO_DB_PATH: "/home/nonroot/db.sqlite3"
-          EMAIL_HOST_PASSWORD: "{{ lookup('env', 'EMAIL_HOST_PASSWORD') }}"
+          EMAIL_HOST_USER: "{{ email_host_user }}"
+          EMAIL_HOST_PASSWORD: "{{ email_host_password }}"
+          MAILGUN_API_KEY: "{{  mailgun_api_key }}"
         ports:
           80:8888 # container port 80 (standard http port) maps to server port 8888 (arbitrary internal port)
 
diff --git a/infra/group_vars/production/vault.yaml b/infra/group_vars/production/vault.yaml
new file mode 100644
index 0000000..b898ca8
--- /dev/null
+++ b/infra/group_vars/production/vault.yaml
@@ -0,0 +1,22 @@
+$ANSIBLE_VAULT;1.1;AES256
+33333861646565323863616363316265346132643135656533613763336462656361353562396163
+6461313530323231383264373737323934346239316232340a356130646163636436663162386438
+30636530373663643166616665313738303437636562643035303138613861656165663939613433
+3465316130343732660a376536373136636162316665386536363536306130383033623735396634
+66383262643630356536633366373933313637646539643137356330316463356139613738386661
+34663231656232666630653162653732363431613461396464623133303965636432626536306634
+64373530313532353531633263383335653239386530343330326237343862386436633666646235
+31613530383834656462366535643030356562313237363735386337356165663564336564623862
+34623863623738653735393734336635616135383036306231623464653432616265626233306230
+63646466323135363466393832636466646434303564653032323366346430306336363435653761
+30336437373231376261326264616131653833616236623365393334303834626162343761623037
+36666665663866643263383835626336353030626337303461396665343731666465653662396164
+34306261356130363037643637303632663830383331346334313336663163303730306265393031
+39653231373139616465326561313633306433653461653931663164363565363636316433323933
+61333536323936306538343336663966633161633565666231393261643062636239323264623364
+38376266393937376133366561663931356236396131376137653536636539613738356466363334
+32326165316434636631613366376235633337356135333531623861343039346261656239613036
+65303836323538373832646531343234666330363161343337623539633464303161343765363331
+35386233303563346662633239346363373931333764383233623161313965623266656364383037
+32393738356532346665613031346338363738666265303765363438663062663237353033393262
+6137
diff --git a/infra/group_vars/staging/vault.yaml b/infra/group_vars/staging/vault.yaml
new file mode 100644
index 0000000..b898ca8
--- /dev/null
+++ b/infra/group_vars/staging/vault.yaml
@@ -0,0 +1,22 @@
+$ANSIBLE_VAULT;1.1;AES256
+33333861646565323863616363316265346132643135656533613763336462656361353562396163
+6461313530323231383264373737323934346239316232340a356130646163636436663162386438
+30636530373663643166616665313738303437636562643035303138613861656165663939613433
+3465316130343732660a376536373136636162316665386536363536306130383033623735396634
+66383262643630356536633366373933313637646539643137356330316463356139613738386661
+34663231656232666630653162653732363431613461396464623133303965636432626536306634
+64373530313532353531633263383335653239386530343330326237343862386436633666646235
+31613530383834656462366535643030356562313237363735386337356165663564336564623862
+34623863623738653735393734336635616135383036306231623464653432616265626233306230
+63646466323135363466393832636466646434303564653032323366346430306336363435653761
+30336437373231376261326264616131653833616236623365393334303834626162343761623037
+36666665663866643263383835626336353030626337303461396665343731666465653662396164
+34306261356130363037643637303632663830383331346334313336663163303730306265393031
+39653231373139616465326561313633306433653461653931663164363565363636316433323933
+61333536323936306538343336663966633161633565666231393261643062636239323264623364
+38376266393937376133366561663931356236396131376137653536636539613738356466363334
+32326165316434636631613366376235633337356135333531623861343039346261656239613036
+65303836323538373832646531343234666330363161343337623539633464303161343765363331
+35386233303563346662633239346363373931333764383233623161313965623266656364383037
+32393738356532346665613031346338363738666265303765363438663062663237353033393262
+6137
diff --git a/infra/inventory.ini b/infra/inventory.ini
new file mode 100644
index 0000000..28cd6cf
--- /dev/null
+++ b/infra/inventory.ini
@@ -0,0 +1,7 @@
+[staging]
+staging.earthmanrpg.me
+
+[production]
+www.earthmanrpg.me
+earthmanrpg.me
+dashboard.earthmanrpg.me
diff --git a/requirements.dev.txt b/requirements.dev.txt
index 74442056015df1b853f40c2c19d9679af799d4ad..5c17466b82cf57936cba4070e59b45124007eaf2 100644
GIT binary patch
literal 531
zcmY*WJ8uIa4Bq)KXTd$vW?-n)v6Uiq>QoWpTxmGCU{1;9*VmA!Qa5bu?`1=yOL)|}
z1EoL;lXD`i+W~s6ET-&^j%&#s9#E~Y$Jzi{{=ZEk%uR@CGTz-V6`&q^VTlMm+N`yL
zjz?dAOc<lq8-5?^yP>@7nQMR+p8xe4yz<_?KQ6)9m;!5H7+(HXN^1$K0J%djcj>}k
zCtuN_6>-TnPWYgPIZ~ElHuhvj7sl$2>($OhJxgw(?Zj^Vi1x&K6g+_v3C{~sE?Gd=
z!XS#B;Fd}29=a`)Q*aywTPg;XpqMfqYz*1BfHlOLA)S5YDWV6)$*Jtf0xE0KTyRfJ
zjqI6yu^5rp8L8Q=pD*ukcT=U!H;`M!2<yx?zBnWd<YHirJ*c6;-3}&mBK2IISd#Z{
b-xUiRM*ZVytaljdX^N2x%_-)GkyiWytk|CY

literal 1124
zcmZ`&O;3YR5S+7#KLt`s>&L-^iAPOLJb5w|u%eVA(A4_l)tOyhX=BU_P`bM_v$M<3
z_W~W3DAA(83$A!l#7KBzOmK=5EYS0`%u{rVIU}=uG-F-Mc**K=$e0XSj*{?AI2kj>
z9H9q>46kGnLqVhnHP(Dv@xO|gU&auWiFr2Qb*xZL#Vcc_a->@wxb_>o5v68_Ym1)k
zBl$rjB1(@9p7|7pI-K&lFrNQ1BeH%Dtj85gV%1chSs%4wP6t&%*{gXhHu;cXR8}Hq
z^}?#cEaYEBwiWNH@ocG7WKF)_*jChZ>_Uu&arNhpG(^tu&by{AXO!<#4H-LTD9<O-
z4jE!gjqe^iJP=hl?wDLZw?3ptyYxX#h4F^H(Ol%}+%Ur2<kN<INrh&c;*xh)(wU3C
zH9o&E-DJSfp7i9&t^1n47uJ<_a^xMiwWF@;pf|C~f6dQzY12#g79y_M^@Lc2EjhI<
z?t!*8<ZIi*TzdM{m<ti)*(0uThg-`H6AbzO%}m&RvR9&NpV1Rhv}*+&=}e!V!826^
z&w73@IbDzwici^}PuFL+VSg1*N&V@N5!*ibF8%E+qPNNy_xO#CQ`%BVL)0~+$5V2|
EU)GnRfB*mh

diff --git a/requirements.txt b/requirements.txt
index 0015bcf..097df52 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@ Django==6.0
 django-stubs==5.2.8
 django-stubs-ext==5.2.8
 gunicorn==23.0.0
+requests==2.31.0
diff --git a/src/apps/lyric/views.py b/src/apps/lyric/views.py
index bbd3a5e..6d18ab1 100644
--- a/src/apps/lyric/views.py
+++ b/src/apps/lyric/views.py
@@ -1,5 +1,7 @@
+import requests
 from django.contrib import auth, messages
-from django.core.mail import send_mail
+from django.conf import settings
+# from django.core.mail import send_mail
 from django.shortcuts import redirect
 from django.urls import reverse
 from .models import Token
@@ -11,12 +13,21 @@ def send_login_email(request):
         reverse("login") + "?token=" + str(token.uid),
     )
     message_body = f"Use this magic link to login to your Dashboard:\n\n{url}"
-    send_mail(
-        "A magic login link to your Dashboard",
-        message_body,
-        "adman@howdy.earthmanrpg.me",
-        [email],
+    # Send mail via Mailgun HTTP API
+    response = requests.post(
+        f"https://api.mailgun.net/v3/{settings.MAILGUN_DOMAIN}/messages",
+        auth=("api", settings.MAILGUN_API_KEY),
+        data={
+            "from": "adman@howdy.earthmanrpg.me",
+            "to": email,
+            "subject": "A magic login link to your Dashboard",
+            "text": message_body,
+        },
     )
+    # Log any errors
+    if response.status_code != 200:
+        print(f"Mailgun API error: {response.status_code}: {response.text}")
+
     messages.success(
         request,
         "Check your email!—there you'll find a magic login link. But hurry… it's only temporary!",
diff --git a/src/core/settings.py b/src/core/settings.py
index e590263..1630cec 100644
--- a/src/core/settings.py
+++ b/src/core/settings.py
@@ -156,4 +156,7 @@ EMAIL_HOST = "smtp.mailgun.org"
 EMAIL_HOST_USER = os.environ.get("EMAIL_HOST_USER") # switch back to .environ[] when collectstatic moved outside docker build process
 EMAIL_HOST_PASSWORD = os.environ.get("EMAIL_HOST_PASSWORD") # switch back to .environ[]
 EMAIL_PORT = 587
-EMAIL_USER_TLS = True
+EMAIL_USE_TLS = True
+# Mailgun API settings (for HTTP API instead of SMTP)
+MAILGUN_API_KEY = os.environ.get("MAILGUN_API_KEY")
+MAILGUN_DOMAIN = "howdy.earthmanrpg.me" # Your Mailgun domain
\ No newline at end of file