diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-07-04 18:55:45 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-07-04 18:55:45 +0000 |
| commit | fc42dd2cef3f1e43af19f6455011cdd5d298aef5 (patch) | |
| tree | f5604c240760acc36eecda64e2f94fcd088a0409 /doc | |
| parent | 5d0b53544c859506cc7f2e52f0a5243e50bca5e9 (diff) | |
| download | redmine-fc42dd2cef3f1e43af19f6455011cdd5d298aef5.tar.gz redmine-fc42dd2cef3f1e43af19f6455011cdd5d298aef5.zip | |
Email delivery configuration moved to an unversioned YAML file (config/email.yml, see the sample file) (#1412).
Email delivery is disabled. It's automatically turned on when configuration is found.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1625 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/INSTALL | 10 | ||||
| -rw-r--r-- | doc/UPGRADING | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/doc/INSTALL b/doc/INSTALL index 87a2b38d5..13502f8d0 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -53,10 +53,10 @@ Optional: trackers, statuses, workflow) and adjust application settings -== SMTP server Configuration - -In config/environment.rb, you can set parameters for your SMTP server: -config.action_mailer.smtp_settings: SMTP server configuration -config.action_mailer.perform_deliveries: set to false to disable mail delivering +== Email delivery Configuration +Copy config/email.yml.example to config/email.yml and edit this file +to adjust your SMTP settings. Don't forget to restart the application after any change to this file. + +Please do not enter your SMTP settings in environment.rb. diff --git a/doc/UPGRADING b/doc/UPGRADING index 2edb2952a..1dd901171 100644 --- a/doc/UPGRADING +++ b/doc/UPGRADING @@ -10,15 +10,13 @@ http://www.redmine.org/ 1. Uncompress the program archive in a new directory 3. Copy your database settings (RAILS_ROOT/config/database.yml) + and SMTP settings (RAILS_ROOT/config/email.yml) into the new config directory -4. Enter your SMTP settings in config/environment.rb - Do not replace this file with the old one - -5. Migrate your database (please make a backup before doing this): +4. Migrate your database (please make a backup before doing this): rake db:migrate RAILS_ENV="production" -6. Copy the RAILS_ROOT/files directory content into your new installation +5. Copy the RAILS_ROOT/files directory content into your new installation This directory contains all the attached files |