Merge pull request #626 from lowang/master

ActionMailer https protocol links

Merge pull request #626 from lowang/master
ActionMailer https protocol links
Arthur Nogueira Neves
2 parents ec372340 dae66cf9
Showing 2 changed files with 6 additions and 1 deletions Show diff stats
config/config.example.yml
config/initializers/_load_config.rb
@@ -15,6 +15,10 @@ host: errbit.example.com
 # Only set this if it isn't the default for the protocol (i.e.. 80 for HTTP, 443 for HTTPS)
 # port: 8080
  
+# The protocol for your errbit server.
+# Only set if not running default HTTP
+# protocol: https
+
 # Enforce SSL connections
 enforce_ssl: false
  
@@ -81,7 +81,8 @@ end
 (ActionMailer::Base.default_url_options ||= {}).tap do |default|
   options_from_config = {
     host: Errbit::Config.host,
-    port: Errbit::Config.port
+    port: Errbit::Config.port,
+    protocol: Errbit::Config.protocol
   }.select { |k, v| v }
  
   default.reverse_merge!(options_from_config)
...	...	@@ -15,6 +15,10 @@ host: errbit.example.com
15	15	# Only set this if it isn't the default for the protocol (i.e.. 80 for HTTP, 443 for HTTPS)
16	16	# port: 8080
17	17
	18	+# The protocol for your errbit server.
	19	+# Only set if not running default HTTP
	20	+# protocol: https
	21	+
18	22	# Enforce SSL connections
19	23	enforce_ssl: false
20	24
...	...
...	...	@@ -81,7 +81,8 @@ end
81	81	(ActionMailer::Base.default_url_options \|\|= {}).tap do \|default\|
82	82	options_from_config = {
83	83	host: Errbit::Config.host,
84		- port: Errbit::Config.port
	84	+ port: Errbit::Config.port,
	85	+ protocol: Errbit::Config.protocol
85	86	}.select { \|k, v\| v }
86	87
87	88	default.reverse_merge!(options_from_config)
...	...