More SMTP customization (#1372)
* Allow SMTP auth method customization * Add SMTP openssl_verify_mode option support Allows one use self-signed certs with their SMTP server. * Add SMTP enable_starttls_auto option support
This commit is contained in:
		
				
					committed by
					
						
						wxcafé
					
				
			
			
				
	
			
			
			
						parent
						
							f690320fb9
						
					
				
				
					commit
					0dbbc16c69
				
			@@ -35,6 +35,10 @@ SMTP_PORT=587
 | 
			
		||||
SMTP_LOGIN=
 | 
			
		||||
SMTP_PASSWORD=
 | 
			
		||||
SMTP_FROM_ADDRESS=notifications@example.com
 | 
			
		||||
#SMTP_AUTH_METHOD=plain
 | 
			
		||||
#SMTP_OPENSSL_VERIFY_MODE=peer
 | 
			
		||||
#SMTP_ENABLE_STARTTLS_AUTO=true
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Optional asset host for multi-server setups
 | 
			
		||||
# CDN_HOST=assets.example.com
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										12
									
								
								app.json
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								app.json
									
									
									
									
									
								
							@@ -79,6 +79,18 @@
 | 
			
		||||
    "SMTP_FROM_ADDRESS": {
 | 
			
		||||
      "description": "Address to send emails from",
 | 
			
		||||
      "required": false
 | 
			
		||||
    },
 | 
			
		||||
    "SMTP_AUTH_METHOD": {
 | 
			
		||||
      "description": "Authentication method to use with SMTP server. Default is 'plain'.",
 | 
			
		||||
      "required": false
 | 
			
		||||
    },
 | 
			
		||||
    "SMTP_OPENSSL_VERIFY_MODE": {
 | 
			
		||||
      "description": "SMTP server certificate verification mode. Defaults is 'peer'.",
 | 
			
		||||
      "required": false
 | 
			
		||||
    },
 | 
			
		||||
    "SMTP_ENABLE_STARTTLS_AUTO": {
 | 
			
		||||
      "description": "Enable STARTTLS if SMTP server supports it? Default is true.",
 | 
			
		||||
      "required": false
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "buildpacks": [
 | 
			
		||||
 
 | 
			
		||||
@@ -99,7 +99,9 @@ Rails.application.configure do
 | 
			
		||||
    :user_name      => ENV['SMTP_LOGIN'],
 | 
			
		||||
    :password       => ENV['SMTP_PASSWORD'],
 | 
			
		||||
    :domain         => ENV['SMTP_DOMAIN'] || config.x.local_domain,
 | 
			
		||||
    :authentication => :plain,
 | 
			
		||||
    :authentication => ENV['SMTP_AUTH_METHOD'] || :plain,
 | 
			
		||||
    :openssl_verify_mode => ENV['SMTP_OPENSSL_VERIFY_MODE'] || 'peer',
 | 
			
		||||
    :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  config.action_mailer.delivery_method = :smtp
 | 
			
		||||
 
 | 
			
		||||
@@ -71,6 +71,18 @@
 | 
			
		||||
      "description": "Address to send emails from",
 | 
			
		||||
      "required": false
 | 
			
		||||
    },
 | 
			
		||||
    "SMTP_AUTH_METHOD": {
 | 
			
		||||
      "description": "Authentication method to use with SMTP server. Default is 'plain'.",
 | 
			
		||||
      "required": false
 | 
			
		||||
    },
 | 
			
		||||
    "SMTP_OPENSSL_VERIFY_MODE": {
 | 
			
		||||
      "description": "SMTP server certificate verification mode. Defaults is 'peer'.",
 | 
			
		||||
      "required": false
 | 
			
		||||
    },
 | 
			
		||||
    "SMTP_ENABLE_STARTTLS_AUTO": {
 | 
			
		||||
      "description": "Enable STARTTLS if SMTP server supports it? Default is true.",
 | 
			
		||||
      "required": false
 | 
			
		||||
    },
 | 
			
		||||
    "BUILDPACK_URL": {
 | 
			
		||||
      "description": "Internal scalingo configuration",
 | 
			
		||||
      "required": true,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user