diff --git a/config/config.example.yml b/config/config.example.yml index a12a263..66dce25 100644 --- 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 index 1b7f3e5..7f3ab68 100644 --- a/config/initializers/_load_config.rb +++ b/config/initializers/_load_config.rb @@ -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) -- libgit2 0.21.2