From 0b00616b8c266c5c5f2a90fc0ed1f78f15b0d286 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer <raphael@joindiaspora.com> Date: Thu, 11 Aug 2011 12:01:14 -0700 Subject: [PATCH] Create appConfig option for following diasporahq --- app/models/user.rb | 6 ++++-- config/application.yml.example | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index d99102ec67..ec38e93925 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -349,8 +349,10 @@ class User < ActiveRecord::Base self.aspects.create(:name => I18n.t('aspects.seed.work')) aq = self.aspects.create(:name => I18n.t('aspects.seed.acquaintances')) - default_account = Webfinger.new('diasporahq@joindiaspora.com').fetch - self.share_with(default_account, aq) if default_account + unless AppConfig[:no_follow_diasporahq] + default_account = Webfinger.new('diasporahq@joindiaspora.com').fetch + self.share_with(default_account, aq) if default_account + end aq end diff --git a/config/application.yml.example b/config/application.yml.example index d2bd7396ef..7c01c0747c 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -17,6 +17,12 @@ defaults: &defaults # Set this to true if you want users to invite as many people as they want open_invitations: true + # Set this to true if you don't want your users to follow the diasporahq@joindiaspora.com + # account on account creation. The diasporahq account helps users start with some + # activity in their stream and get news about Diaspora, but if you don't want your server + # to contact joindiaspora.com, set this to true: + no_follow_diasporahq: false + # # Logging setup # -- GitLab