From 999d47f98679e4b706eb8436eea30513ba098bcb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 25 Aug 2008 16:35:20 +0000 Subject: [PATCH] Use example.net as domain in default configuration (#1762). git-svn-id: http://redmine.rubyforge.org/svn/trunk@1764 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/email.yml.example | 10 +++++----- config/settings.yml | 2 +- db/migrate/001_setup.rb | 2 +- lib/tasks/email.rake | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/email.yml.example b/config/email.yml.example index a67c12279..685096da4 100644 --- a/config/email.yml.example +++ b/config/email.yml.example @@ -3,11 +3,11 @@ production: delivery_method: :smtp smtp_settings: - address: smtp.somenet.foo + address: smtp.example.net port: 25 - domain: somenet.foo + domain: example.net authentication: :login - user_name: redmine@somenet.foo + user_name: redmine@example.net password: redmine development: @@ -15,7 +15,7 @@ development: smtp_settings: address: 127.0.0.1 port: 25 - domain: somenet.foo + domain: example.net authentication: :login - user_name: redmine@somenet.foo + user_name: redmine@example.net password: redmine diff --git a/config/settings.yml b/config/settings.yml index 78a366f35..9a59d5686 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -43,7 +43,7 @@ activity_days_default: per_page_options: default: '25,50,100' mail_from: - default: redmine@somenet.foo + default: redmine@example.net bcc_recipients: default: 1 text_formatting: diff --git a/db/migrate/001_setup.rb b/db/migrate/001_setup.rb index 13960ba8c..d49e0e444 100644 --- a/db/migrate/001_setup.rb +++ b/db/migrate/001_setup.rb @@ -290,7 +290,7 @@ class Setup < ActiveRecord::Migration :admin => true, :firstname => "Redmine", :lastname => "Admin", - :mail => "admin@somenet.foo", + :mail => "admin@example.net", :mail_notification => true, :language => "en", :status => 1 diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake index daf0aa9bb..a37b3e197 100644 --- a/lib/tasks/email.rake +++ b/lib/tasks/email.rake @@ -74,14 +74,14 @@ Examples: # No project specified. Emails MUST contain the 'Project' keyword: rake redmine:email:receive_iamp RAILS_ENV="production" \\ - host=imap.foo.bar username=redmine@somenet.foo password=xxx + host=imap.foo.bar username=redmine@example.net password=xxx # Fixed project and default tracker specified, but emails can override # both tracker and priority attributes: rake redmine:email:receive_iamp RAILS_ENV="production" \\ - host=imap.foo.bar username=redmine@somenet.foo password=xxx ssl=1 \\ + host=imap.foo.bar username=redmine@example.net password=xxx ssl=1 \\ project=foo \\ tracker=bug \\ allow_override=tracker,priority