1
0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 23:11:12 +00:00

Lowering configuration.example.yml confusion (#17492)

git-svn-id: http://svn.redmine.org/redmine/trunk@13402 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-09-14 11:32:10 +00:00
parent abbe06a98e
commit d444dc61af

View File

@ -6,20 +6,16 @@
# #
# Note that this file needs to be a valid YAML file. # Note that this file needs to be a valid YAML file.
# DO NOT USE TABS! Use 2 spaces instead of tabs for identation. # DO NOT USE TABS! Use 2 spaces instead of tabs for identation.
#
# == Outgoing email settings (email_delivery setting) # default configuration options for all environments
# default:
# === Common configurations # Outgoing emails configuration
# # See the examples below and the Rails guide for more configuration options:
# ==== Sendmail command # http://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration
# email_delivery:
# production:
# email_delivery:
# delivery_method: :sendmail
#
# ==== Simple SMTP server at localhost # ==== Simple SMTP server at localhost
# #
# production:
# email_delivery: # email_delivery:
# delivery_method: :smtp # delivery_method: :smtp
# smtp_settings: # smtp_settings:
@ -28,7 +24,6 @@
# #
# ==== SMTP server at example.com using LOGIN authentication and checking HELO for foo.com # ==== SMTP server at example.com using LOGIN authentication and checking HELO for foo.com
# #
# production:
# email_delivery: # email_delivery:
# delivery_method: :smtp # delivery_method: :smtp
# smtp_settings: # smtp_settings:
@ -41,7 +36,6 @@
# #
# ==== SMTP server at example.com using PLAIN authentication # ==== SMTP server at example.com using PLAIN authentication
# #
# production:
# email_delivery: # email_delivery:
# delivery_method: :smtp # delivery_method: :smtp
# smtp_settings: # smtp_settings:
@ -53,11 +47,9 @@
# password: 'password' # password: 'password'
# #
# ==== SMTP server at using TLS (GMail) # ==== SMTP server at using TLS (GMail)
#
# This might require some additional configuration. See the guides at: # This might require some additional configuration. See the guides at:
# http://www.redmine.org/projects/redmine/wiki/EmailConfiguration # http://www.redmine.org/projects/redmine/wiki/EmailConfiguration
# #
# production:
# email_delivery: # email_delivery:
# delivery_method: :smtp # delivery_method: :smtp
# smtp_settings: # smtp_settings:
@ -69,26 +61,10 @@
# user_name: "your_email@gmail.com" # user_name: "your_email@gmail.com"
# password: "your_password" # password: "your_password"
# #
# ==== Sendmail command
# #
# === More configuration options # email_delivery:
# # delivery_method: :sendmail
# See following page:
#
# http://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration
# default configuration options for all environments
default:
# Outgoing emails configuration (see examples above)
email_delivery:
delivery_method: :smtp
smtp_settings:
address: smtp.example.net
port: 25
domain: example.net
authentication: :login
user_name: "redmine@example.net"
password: "redmine"
# Absolute path to the directory where attachments are stored. # Absolute path to the directory where attachments are stored.
# The default is the 'files' directory in your Redmine instance. # The default is the 'files' directory in your Redmine instance.