Remove USE_EMBEDDED option - always use embedded frontend
This commit is contained in:
parent
4b9db2c242
commit
3e3620a24f
2 changed files with 4 additions and 17 deletions
|
|
@ -61,8 +61,6 @@ func main() {
|
|||
return
|
||||
}
|
||||
|
||||
useEmbedded := os.Getenv("USE_EMBEDDED") != "false"
|
||||
|
||||
frontendFS := FrontendFileSystem()
|
||||
|
||||
router := http.NewServeMux()
|
||||
|
|
@ -75,15 +73,9 @@ func main() {
|
|||
apiRouter := api.New(database, cfg)
|
||||
router.Handle("/api/", apiRouter.Handler())
|
||||
|
||||
if useEmbedded {
|
||||
router.HandleFunc("/favicon.png", serveStaticFile(frontendFS, "embed/favicon.png"))
|
||||
router.Handle("/_app/", http.StripPrefix("/_app/", serveStaticPrefixed(frontendFS, "embed/_app/")))
|
||||
router.HandleFunc("/", serveSPA(frontendFS))
|
||||
log.Println("Using embedded frontend")
|
||||
} else {
|
||||
router.Handle("/", http.FileServer(http.Dir("../frontend/build")))
|
||||
log.Println("Using filesystem frontend")
|
||||
}
|
||||
router.HandleFunc("/favicon.png", serveStaticFile(frontendFS, "embed/favicon.png"))
|
||||
router.Handle("/_app/", http.StripPrefix("/_app/", serveStaticPrefixed(frontendFS, "embed/_app/")))
|
||||
router.HandleFunc("/", serveSPA(frontendFS))
|
||||
|
||||
addr := fmt.Sprintf("%s:%s", cfg.Bind, cfg.Port)
|
||||
log.Printf("Server starting on http://%s", addr)
|
||||
|
|
@ -94,10 +86,7 @@ func generateRandomPassword(length int) string {
|
|||
const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*"
|
||||
result := make([]byte, length)
|
||||
if _, err := rand.Read(result); err != nil {
|
||||
for i := range result {
|
||||
result[i] = charset[i%len(charset)]
|
||||
}
|
||||
return string(result)
|
||||
log.Fatalf("Failed to generate random password: %v", err)
|
||||
}
|
||||
for i := range result {
|
||||
result[i] = charset[int(result[i])%len(charset)]
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ type Config struct {
|
|||
DBName string
|
||||
Bind string
|
||||
Port string
|
||||
UseEmbedded bool
|
||||
JWTSecret string
|
||||
AdminUser string
|
||||
AdminPassword string
|
||||
|
|
@ -43,7 +42,6 @@ func Load() *Config {
|
|||
DBName: getEnv("DB_NAME", "mailserver"),
|
||||
Bind: getEnv("BIND", "0.0.0.0"),
|
||||
Port: getEnv("PORT", "8080"),
|
||||
UseEmbedded: getEnv("USE_EMBEDDED", "true") == "true",
|
||||
JWTSecret: getEnv("JWT_SECRET", "change-this-secret-in-production"),
|
||||
AdminUser: getEnv("ADMIN_USER", ""),
|
||||
AdminPassword: getEnv("ADMIN_PASSWORD", ""),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue