From 8d92b2479f810bc5d20245361fa59339763a1495 Mon Sep 17 00:00:00 2001
From: firescry <49809580+firescry@users.noreply.github.com>
Date: Wed, 12 Jul 2023 10:28:41 +0200
Subject: [bugfix] Align default values in the configuration file with the code
 (#1971)

* Set default value of SMTPFrom to empty string

This parameter should contain proper e-mail address (to be provided by user during configuration).

* Update default values in example/config.yaml

Default values and related comments in example/config.yaml are aligned
with values defined in internal/config/defaults.go.
Small improvements to foramting of config.yaml file.

* Add default value for AdvancedThrottlingRetryAfter to internal/config/defaults.go

AdvancedThrottlingRetryAfter was introduced in 70739d3 (superseriousbusiness/gotosocial#1466).

* Update config.yaml snippets in documentation
---
 internal/config/defaults.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'internal/config/defaults.go')

diff --git a/internal/config/defaults.go b/internal/config/defaults.go
index 34e46b342..dc076bdc7 100644
--- a/internal/config/defaults.go
+++ b/internal/config/defaults.go
@@ -107,7 +107,7 @@ var Defaults = Configuration{
 	SMTPPort:               0,
 	SMTPUsername:           "",
 	SMTPPassword:           "",
-	SMTPFrom:               "GoToSocial",
+	SMTPFrom:               "",
 	SMTPDiscloseRecipients: false,
 
 	TracingEnabled:           false,
@@ -122,7 +122,8 @@ var Defaults = Configuration{
 	AdvancedCookiesSamesite:      "lax",
 	AdvancedRateLimitRequests:    300, // 1 per second per 5 minutes
 	AdvancedThrottlingMultiplier: 8,   // 8 open requests per CPU
-	AdvancedSenderMultiplier:     2,   // 2 senders per CPU
+	AdvancedThrottlingRetryAfter: time.Second * 30,
+	AdvancedSenderMultiplier:     2, // 2 senders per CPU
 
 	Cache: CacheConfiguration{
 		GTS: GTSCacheConfiguration{
-- 
cgit v1.2.3