mirror of
				https://github.com/caddyserver/caddy.git
				synced 2025-10-31 10:37:24 -04:00 
			
		
		
		
	httpcaddyfile: Configure other apps from global options (#3990)
This commit is contained in:
		
							parent
							
								
									ed678235a4
								
							
						
					
					
						commit
						bafb562991
					
				| @ -36,6 +36,17 @@ func init() { | |||||||
| 	caddyconfig.RegisterAdapter("caddyfile", caddyfile.Adapter{ServerType: ServerType{}}) | 	caddyconfig.RegisterAdapter("caddyfile", caddyfile.Adapter{ServerType: ServerType{}}) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | // App represents the configuration for a non-standard | ||||||
|  | // Caddy app module (e.g. third-party plugin) which was | ||||||
|  | // parsed from a global options block. | ||||||
|  | type App struct { | ||||||
|  | 	// The JSON key for the app being configured | ||||||
|  | 	Name string | ||||||
|  | 
 | ||||||
|  | 	// The raw app config as JSON | ||||||
|  | 	Value json.RawMessage | ||||||
|  | } | ||||||
|  | 
 | ||||||
| // ServerType can set up a config from an HTTP Caddyfile. | // ServerType can set up a config from an HTTP Caddyfile. | ||||||
| type ServerType struct { | type ServerType struct { | ||||||
| } | } | ||||||
| @ -260,6 +271,17 @@ func (st ServerType) Setup(inputServerBlocks []caddyfile.ServerBlock, | |||||||
| 
 | 
 | ||||||
| 	// annnd the top-level config, then we're done! | 	// annnd the top-level config, then we're done! | ||||||
| 	cfg := &caddy.Config{AppsRaw: make(caddy.ModuleMap)} | 	cfg := &caddy.Config{AppsRaw: make(caddy.ModuleMap)} | ||||||
|  | 
 | ||||||
|  | 	// loop through the configured options, and if any of | ||||||
|  | 	// them are an httpcaddyfile App, then we insert them | ||||||
|  | 	// into the config as raw Caddy apps | ||||||
|  | 	for _, opt := range options { | ||||||
|  | 		if app, ok := opt.(App); ok { | ||||||
|  | 			cfg.AppsRaw[app.Name] = app.Value | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	// insert the standard Caddy apps into the config | ||||||
| 	if len(httpApp.Servers) > 0 { | 	if len(httpApp.Servers) > 0 { | ||||||
| 		cfg.AppsRaw["http"] = caddyconfig.JSON(httpApp, &warnings) | 		cfg.AppsRaw["http"] = caddyconfig.JSON(httpApp, &warnings) | ||||||
| 	} | 	} | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user