From c28bf3cdbf3e6d7c02acd5f8dd0a604700f14380 Mon Sep 17 00:00:00 2001
From: ace <ace@0xace.cc>
Date: Thu, 25 Mar 2021 21:33:58 +0300
Subject: [PATCH] update mastodon admin account values

---
 inventory/ghp/sample/group_vars/all/all.yaml |  1 +
 roles/mastodon/defaults/main.yaml            | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/inventory/ghp/sample/group_vars/all/all.yaml b/inventory/ghp/sample/group_vars/all/all.yaml
index b185dfd..698e1ef 100644
--- a/inventory/ghp/sample/group_vars/all/all.yaml
+++ b/inventory/ghp/sample/group_vars/all/all.yaml
@@ -126,3 +126,4 @@ mastodon_publish: true
 #mastodon_assets_storage: "nfs-ssd"
 #mastodon_system_size: "100Gi"
 #mastodon_system_storage: "nfs-hdd"
+#mastodon_admin_email: "mastodon@{{ mail_domain }}"
diff --git a/roles/mastodon/defaults/main.yaml b/roles/mastodon/defaults/main.yaml
index 3812409..bb8b2ba 100644
--- a/roles/mastodon/defaults/main.yaml
+++ b/roles/mastodon/defaults/main.yaml
@@ -3,6 +3,7 @@ mastodon_publish: true
 mastodon_use_external_db: true
 mastodon_short_name: "mastodon"
 mastodon_enable_elasticsearch: true
+mastodon_admin_email: "mastodon@{{ mail_domain | default(domain) }}" 
 mastodon_default_values:
   ingress:
     enabled: true
@@ -23,9 +24,9 @@ mastodon_default_values:
   # have to be reset
   createAdmin:
     enabled: true
-    username: mastodon
+    username: "{{ mastodon_admin_user | default(mastodon_admin_username) | default('mastodon') }}"
     password: "{{ mastodon_admin_pass | default(mastodon_admin_password) }}" 
-    email: "admin@{{ domain }}"
+    email: "{{ mastodon_admin_email }}"
   
   # available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43
   locale: en
@@ -62,12 +63,12 @@ mastodon_default_values:
     delivery_method: smtp
     domain: "{{ domain }}"
     enable_starttls_auto: false
-    from_address: "mastodon@{{ domain }}"
-    login: mastodon
+    from_address: "{{ mastodon_admin_email }}"
+    login: "{{ mastodon_admin_user | default(mastodon_admin_username) | default('mastodon') }}"
     openssl_verify_mode: false
     password: "{{ mastodon_ldap_pass | default(mastodon_ldap_password) }}"
     port: 465
-    reply_to: "mastodon@{{ domain }}"
+    reply_to: "{{ mastodon_admin_email }}"
     server: "{{ mail_short_name | default('mail') }}.{{ domain }}"
     tls: true