jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configuration冲突处理

This commit is contained in:
huang 2015-07-03 15:51:54 +08:00
parent 6da8cf237d
commit 750070bdc7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/configuration.yml
View File

@ -103,7 +103,7 @@ default:
# autologin_cookie_name: the name of the cookie (default: autologin)
# autologin_cookie_path: the cookie path (default: /)
# autologin_cookie_secure: true sets the cookie secure flag (default: false)
autologin_cookie_name:
autologin_cookie_name: "autologin_trustie"
autologin_cookie_path:
autologin_cookie_secure:
@ -200,7 +200,7 @@ default:
# specific configuration options for production environment
# that overrides the default ones
production:
# CJK support
cookie_domain: ".trustie.net"
rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
email_delivery:
delivery_method: :smtp
@ -218,9 +218,9 @@ development:
email_delivery:
delivery_method: :smtp
smtp_settings:
address: smtp.163.com
address: mail.trustie.net
port: 25
domain: smtp.163.com
authentication: :plain
user_name: huang.jingquan@163.com
password: 'xinhu1ji2qu366'
domain: mail.trustie.net
authentication: :login
user_name: "mail@trustie.net"
password: "loong2010"