From 9d9fef0aa79f20c8147441b87196dcac1623ae95 Mon Sep 17 00:00:00 2001
From: Tunui Franken <tfranken@protonmail.com>
Date: Sun, 23 Mar 2025 13:53:56 +0100
Subject: [PATCH] fixup! Use sendmail for forgejo mailing

---
 inventory/host_vars/lime2          | 7 -------
 roles/forgejo/defaults/main.yml    | 1 -
 roles/forgejo/templates/app.ini.j2 | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/inventory/host_vars/lime2 b/inventory/host_vars/lime2
index 1b1e978..ae20677 100644
--- a/inventory/host_vars/lime2
+++ b/inventory/host_vars/lime2
@@ -38,13 +38,6 @@ forgejo_secret_key: !vault |
           63633864643136356335343835313161396632393162643664353532303762356365633336326565
           36326263343266356166383738303238373033666366366532616339626661633132393466383238
           61663365386435356362
-forgejo_mail_pass: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          33616337353630613339306365336430323266663832623664353734326532396339363864656662
-          6236313037613233376365343264636165623737303031380a663532383833316434383538623831
-          64363636623833303636396133313230383438323235343432616237393666623434656538653233
-          6533353037343062640a356636633062303838633433636665346534333965373665366136623639
-          62393561636661393161663966643363646364663739303630666434323836316265
 forgejo_user: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           66613732343766613938663063666663323739623332626336343863356661663031613136323866
diff --git a/roles/forgejo/defaults/main.yml b/roles/forgejo/defaults/main.yml
index 32da465..ac9fd76 100644
--- a/roles/forgejo/defaults/main.yml
+++ b/roles/forgejo/defaults/main.yml
@@ -8,7 +8,6 @@ forgejo_secret_key:
 forgejo_ssh_host: tunuifranken.info
 forgejo_ssh_port: 22
 forgejo_mail_user: git@tunuifranken.info
-forgejo_mail_pass: foo
 forgejo_user: admin
 forgejo_pass: admin
 forgejo_db_name: forgejodb
diff --git a/roles/forgejo/templates/app.ini.j2 b/roles/forgejo/templates/app.ini.j2
index f6f519a..0eb50e1 100644
--- a/roles/forgejo/templates/app.ini.j2
+++ b/roles/forgejo/templates/app.ini.j2
@@ -44,7 +44,7 @@ LANDING_PAGE          = explore
 ENABLED   = true
 ;TODO: When my mailserver is ready, set PROTOCOL to 'sendmail'
 PROTOCOL  = dummy
-FROM      = {{ forgejo_mail_user }}
+FROM      = "{{ forgejo_user }}" <{{ forgejo_mail_user }}>
 
 [service]
 REGISTER_EMAIL_CONFIRM            = false