1 files changed, 28 insertions, 9 deletions

diff --git a/echo/echo_default.go b/echo/echo_default.go
index ab163ff..895ee6e 100644
--- a/echo/echo_default.go
+++ b/echo/echo_default.go
@@ -5,7 +5,9 @@ import (
         "crypto/tls"
         "fmt"
         "html/template"
+        "io/fs"
         "net/http"
+        "path"
         "sync"
 
         glmw "code.crute.us/mcrute/golib/echo/middleware"
@@ -20,10 +22,10 @@ type EchoConfig struct {
         Debug                 bool
         BindAddress           string
         BindTLSAddress        string
-        TLSCert               string
-        TLSKey                string
+        TLSCacheDir           string
         TrustedProxyIPRanges  []string
-        TemplatePath          *string
+        EmbeddedTemplates     fs.FS
+        DiskTemplates         fs.FS
         TemplateGlob          *string
         TemplateFunctions     template.FuncMap
         CombinedHostLogFile   string
@@ -34,6 +36,7 @@ type EchoConfig struct {
 type EchoWrapper struct {
         *echo.Echo
         tlsServer   http.Server
+        templateFS  fs.FS
         bindAddress string
         ocspErrors  chan gltls.OcspError
         ocspManager *gltls.OcspManager
@@ -51,7 +54,7 @@ func (w *EchoWrapper) Init() error {
 }
 
 func (w *EchoWrapper) CachedStaticRoute(prefix, path string) {
-        w.Group(prefix, glmw.CacheOneMonthMiddleware).Static("/", path)
+        StaticFS(w.GET, w.templateFS, prefix, path, glmw.CacheOneMonthMiddleware)
 }
 
 func (w *EchoWrapper) OcspErrors() chan gltls.OcspError {
@@ -103,6 +106,10 @@ func (w *EchoWrapper) ServeTLS(ctx context.Context, wg *sync.WaitGroup) error {
         )
 }
 
+func (w *EchoWrapper) GetTemplateFS() fs.FS {
+        return w.templateFS
+}
+
 // NewDefaultEchoWithConfig builds a wrapper around an Echo instance and
 // configures it in the default way that it should probably be configured in
 // all cases. The struct returned from this function can be treated like a
@@ -120,11 +127,22 @@ func NewDefaultEchoWithConfig(c EchoConfig) (*EchoWrapper, error) {
                 return nil, fmt.Errorf("Error building XFF IP extractor: %w", err)
         }
 
+        // Use templates from disk in debug mode and the embedded ones that are
+        // built-in to the binary for prod mode.
+        var templates fs.FS
+        if c.DiskTemplates != nil && c.Debug { // Debug Mode
+                templates = c.DiskTemplates
+        } else if c.EmbeddedTemplates != nil && !c.Debug { // Prod Mode
+                templates = c.EmbeddedTemplates
+        } else {
+                return nil, fmt.Errorf("No templates available for use")
+        }
+
         // Only install template handlers if the path and glob are set
-        if c.TemplatePath != nil && c.TemplateGlob != nil {
-                e.HTTPErrorHandler = ErrorHandler(*c.TemplatePath, c.TemplateFunctions)
+        if templates != nil && c.TemplateGlob != nil {
+                e.HTTPErrorHandler = ErrorHandler(templates, c.TemplateFunctions)
 
-                tr, err := NewTemplateRenderer(*c.TemplatePath, *c.TemplateGlob, c.TemplateFunctions)
+                tr, err := NewTemplateRenderer(templates, *c.TemplateGlob, c.TemplateFunctions)
                 if err != nil {
                         return nil, fmt.Errorf("Error loading template renderer: %w", err)
                 }
@@ -146,8 +164,8 @@ func NewDefaultEchoWithConfig(c EchoConfig) (*EchoWrapper, error) {
 
         cmek := make(chan gltls.OcspError)
         cm := &gltls.OcspManager{
-                CertPath: c.TLSCert,
-                KeyPath:  c.TLSKey,
+                CertPath: path.Join(c.TLSCacheDir, "cert.pem"),
+                KeyPath:  path.Join(c.TLSCacheDir, "key.pem"),
                 Errors:   cmek,
         }
 
@@ -181,5 +199,6 @@ func NewDefaultEchoWithConfig(c EchoConfig) (*EchoWrapper, error) {
                 bindAddress: c.BindAddress,
                 ocspErrors:  cmek,
                 ocspManager: cm,
+                templateFS:  templates,
         }, nil
 }