IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2701 from riking/email-pr-ssl

Browse Source 
Rename POP3 settings, fix multisite SSL state leak
This commit is contained in:
Sam
2014-08-29 10:02:05 +10:00
parent 1bef22bbb9 9090df63ba
commit c07d76677d
6 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/application.rb
View File

@@ -91,7 +91,7 @@ module Discourse
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [
:password,
:pop3s_polling_password,
:pop3_polling_password,
:s3_secret_access_key,
:twitter_consumer_secret,
:facebook_app_secret,

14
config/locales/server.en.yml
View File

@@ -926,13 +926,13 @@ en:
disable_emails: "Prevent Discourse from sending any kind of emails"
pop3s_polling_enabled: "Poll via POP3S for email replies."
pop3s_polling_insecure: "Poll using plain text POP3 without SSL."
pop3s_polling_period_mins: "The period in minutes between checking the POP3S account for email. NOTE: requires restart."
pop3s_polling_port: "The port to poll a POP3S account on."
pop3s_polling_host: "The host to poll for email via POP3S."
pop3s_polling_username: "The username for the POP3S account to poll for email."
pop3s_polling_password: "The password for the POP3S account to poll for email."
pop3_polling_enabled: "Poll via POP3 for email replies."
pop3_polling_ssl: "Use SSL while connecting to the POP3 server. (Recommended)"
pop3_polling_period_mins: "The period in minutes between checking the POP3 account for email. NOTE: requires restart."
pop3_polling_port: "The port to poll a POP3 account on."
pop3_polling_host: "The host to poll for email via POP3."
pop3_polling_username: "The username for the POP3 account to poll for email."
pop3_polling_password: "The password for the POP3 account to poll for email."
email_in: "Allow users to post new topics via email (requires pop3 polling). Configure the addresses in the \"Settings\" tab of each category."
email_in_min_trust: "The minimum trust level a user needs to have to be allowed to post new topics via email."
email_prefix: "The [label] used in the subject of emails. It will default to 'title' if not set."

14
config/site_settings.yml
View File

@@ -385,13 +385,13 @@ email:
email_custom_headers: 'Auto-Submitted: auto-generated'
reply_by_email_enabled: false
reply_by_email_address: ''
pop3s_polling_enabled: false
pop3s_polling_insecure: false
pop3s_polling_period_mins: 5
pop3s_polling_host: ''
pop3s_polling_port: 995
pop3s_polling_username: ''
pop3s_polling_password: ''
pop3_polling_enabled: false
pop3_polling_ssl: true
pop3_polling_period_mins: 5
pop3_polling_host: ''
pop3_polling_port: 995
pop3_polling_username: ''
pop3_polling_password: ''
email_in:
default: false
client: true