Merge pull request errbit#626 from lowang/master

ActionMailer https protocol links
jbfarez · Dec 23, 2013 · 121531c · 121531c
2 parents ec37234 + dae66cf
commit 121531c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/config/config.example.yml b/config/config.example.yml
@@ -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
 

diff --git a/config/initializers/_load_config.rb b/config/initializers/_load_config.rb
@@ -81,7 +81,8 @@
 (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)