From 0087fefd14b8310a8b644cbc916c000c14b45b96 Mon Sep 17 00:00:00 2001
From: Jason Robinson <mail@jasonrobinson.me>
Date: Sun, 30 Aug 2015 10:58:02 +0300
Subject: [PATCH] Change default autofollow_on_join_user

Due to performance of joindiaspora.com, a decision was made to set up a project pod that hosts the official support and news autofollow account (see https://www.loomio.org/d/tyZdcGNo/diasporahq-account-move-to-a-project-pod). The new account is hq@pod.diaspora.software.

closes #6369
---
 Changelog.md                | 1 +
 config/defaults.yml         | 2 +-
 config/diaspora.yml.example | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4515a2bb2c..675f428c23 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,7 @@
 * Extract user/profile discovery into the diaspora\_federation-rails gem [#6310](https://github.com/diaspora/diaspora/pull/6310)
 * Refactor PostPresenter [#6315](https://github.com/diaspora/diaspora/pull/6315)
 * Convert BackToTop to a backbone view [#6279](https://github.com/diaspora/diaspora/pull/6279) and [#6360](https://github.com/diaspora/diaspora/pull/6360)
+* Automatically follow the new HQ-Account [#6369](https://github.com/diaspora/diaspora/pull/6369)
 
 ## Bug fixes
 * Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
diff --git a/config/defaults.yml b/config/defaults.yml
index de412e61da..9039da3890 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -99,7 +99,7 @@ defaults:
     pod_name: 'diaspora*'
     enable_registrations: true
     autofollow_on_join: true
-    autofollow_on_join_user: 'diasporahq@joindiaspora.com'
+    autofollow_on_join_user: 'hq@pod.diaspora.software'
     welcome_message:
       enabled: false
       subject: 'Welcome Message'
diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example
index 269834c9a0..64c38602b1 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -408,11 +408,11 @@ configuration: ## Section
     ## follow an account upon creation.
     #autofollow_on_join: true
 
-    ## Auto-follow account (default='diasporahq@joindiaspora.com')
+    ## Auto-follow account (default='hq@pod.diaspora.software')
     ## The diaspora* HQ account keeps users up to date with news about Diaspora.
     ## If you set another auto-follow account (for example your podmin account),
     ## please consider resharing diaspora* HQ's posts for your pod's users!
-    #autofollow_on_join_user: 'diasporahq@joindiaspora.com'
+    #autofollow_on_join_user: 'hq@pod.diaspora.software'
 
     ## Welcome Message settings
     welcome_message: ##Section
-- 
GitLab