summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-08-25 16:35:20 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-08-25 16:35:20 +0000
commit999d47f98679e4b706eb8436eea30513ba098bcb (patch)
treee1964044a9b863abd2da5eb54229c9a98b8610d1 /config
parent66a079f4304026885923b70c7aed9fe2ee805013 (diff)
downloadredmine-999d47f98679e4b706eb8436eea30513ba098bcb.tar.gz
redmine-999d47f98679e4b706eb8436eea30513ba098bcb.zip
Use example.net as domain in default configuration (#1762).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1764 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r--config/email.yml.example10
-rw-r--r--config/settings.yml2
2 files changed, 6 insertions, 6 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: