Refactor Caddyfile adapter and module registration

Use piles from which to draw config values.

Module values can return their name, so now we can do two-way mapping
from value to name and name to value; whereas before we could only map
name to value. This was problematic with the Caddyfile adapter since
it receives values and needs to know the name to put in the config.

1 files changed, 9 insertions, 4 deletions

diff --git a/modules/caddyhttp/subroute.go b/modules/caddyhttp/subroute.go
index 917214655..3b0d718b0 100644
--- a/modules/caddyhttp/subroute.go
+++ b/modules/caddyhttp/subroute.go
@@ -22,10 +22,7 @@ import (
 )
 
 func init() {
-	caddy.RegisterModule(caddy.Module{
-		Name: "http.handlers.subroute",
-		New:  func() interface{} { return new(Subroute) },
-	})
+	caddy.RegisterModule(Subroute{})
 }
 
 // Subroute implements a handler that compiles and executes routes.
@@ -37,6 +34,14 @@ type Subroute struct {
 	Routes RouteList `json:"routes,omitempty"`
 }
 
+// CaddyModule returns the Caddy module information.
+func (Subroute) CaddyModule() caddy.ModuleInfo {
+	return caddy.ModuleInfo{
+		Name: "http.handlers.subroute",
+		New:  func() caddy.Module { return new(Subroute) },
+	}
+}
+
 // Provision sets up subrouting.
 func (sr *Subroute) Provision(ctx caddy.Context) error {
 	if sr.Routes != nil {