 Matthew Holt
					
					5 years ago
						Matthew Holt
					
					5 years ago
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 2A349DD577D586A5
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
3 additions and 
3 deletions
			 
			
		 
		
			
				- 
					
					
					 
					modules/caddypki/ca.go
				
- 
					
					
					 
					modules/caddytls/pemloader.go
				
				
				
					
						
							
								
									
	
		
		
			
				
					|  | @ -51,10 +51,10 @@ type CA struct { | 
			
		
	
		
		
			
				
					|  |  | 	// and Mozilla Firefox trust stores. Default: true.
 |  |  | 	// and Mozilla Firefox trust stores. Default: true.
 | 
			
		
	
		
		
			
				
					|  |  | 	InstallTrust *bool `json:"install_trust,omitempty"` |  |  | 	InstallTrust *bool `json:"install_trust,omitempty"` | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  | 	// The root certificate to use; if empty, one will be generated.
 |  |  | 	// The root certificate to use; if null, one will be generated.
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					|  |  | 	Root *KeyPair `json:"root,omitempty"` |  |  | 	Root *KeyPair `json:"root,omitempty"` | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  | 	// The intermediate (signing) certificate; if empty, one will be generated.
 |  |  | 	// The intermediate (signing) certificate; if null, one will be generated.
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					|  |  | 	Intermediate *KeyPair `json:"intermediate,omitempty"` |  |  | 	Intermediate *KeyPair `json:"intermediate,omitempty"` | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  | 	// Optionally configure a separate storage module associated with this
 |  |  | 	// Optionally configure a separate storage module associated with this
 | 
			
		
	
	
		
		
			
				
					|  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					|  | @ -34,7 +34,7 @@ type PEMLoader []CertKeyPEMPair | 
			
		
	
		
		
			
				
					|  |  | func (PEMLoader) CaddyModule() caddy.ModuleInfo { |  |  | func (PEMLoader) CaddyModule() caddy.ModuleInfo { | 
			
		
	
		
		
			
				
					|  |  | 	return caddy.ModuleInfo{ |  |  | 	return caddy.ModuleInfo{ | 
			
		
	
		
		
			
				
					|  |  | 		ID:  "tls.certificates.load_pem", |  |  | 		ID:  "tls.certificates.load_pem", | 
			
		
	
		
		
			
				
					
					|  |  | 		New: func() caddy.Module { return PEMLoader{} }, |  |  | 		New: func() caddy.Module { return new(PEMLoader) }, | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					|  |  | 	} |  |  | 	} | 
			
		
	
		
		
			
				
					|  |  | } |  |  | } | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  | 
 |