1
0

Fixed no root path for templates and static assets (#12)

This commit is contained in:
konrad
2018-11-02 10:01:28 +00:00
committed by Gitea
parent c51ca4dd26
commit 4f8a0f8739
5 changed files with 14 additions and 2 deletions

View File

@ -4,6 +4,8 @@ import (
"crypto/rand"
"fmt"
"github.com/spf13/viper"
"os"
"path/filepath"
"strings"
)
@ -21,6 +23,12 @@ func InitConfig() (err error) {
viper.SetDefault("service.JWTSecret", random)
viper.SetDefault("service.interface", ":3456")
viper.SetDefault("service.frontendurl", "")
ex, err := os.Executable()
if err != nil {
panic(err)
}
exPath := filepath.Dir(ex)
viper.SetDefault("service.rootpath", exPath)
// Database
viper.SetDefault("database.type", "sqlite")
viper.SetDefault("database.host", "localhost")

View File

@ -69,7 +69,7 @@ func SendMailWithTemplate(to, subject, tpl string, data map[string]interface{})
var plainContent bytes.Buffer
t := &Template{
Templates: template.Must(template.ParseGlob("templates/mail/*.tmpl")),
Templates: template.Must(template.ParseGlob(viper.GetString("service.rootpath") + "/templates/mail/*.tmpl")),
}
boundary := "np" + utils.MakeRandomString(13)

View File

@ -61,7 +61,7 @@ func RegisterRoutes(e *echo.Echo) {
a := e.Group("/api/v1")
// Swagger UI
a.Static("/swagger", "public/swagger")
a.Static("/swagger", viper.GetString("service.rootpath")+"/public/swagger")
a.POST("/login", apiv1.Login)
a.POST("/register", apiv1.RegisterUser)