taldir

commit e229d7d5015df002661d145dc47413614a39cebe
parent c0236946aa3f7b08759ca05bed7a4dac40b869bf
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Tue, 17 Feb 2026 15:36:24 +0100

fix incorrect file loading from datadir

Diffstat:
M
pkg/taldir/taldir.go
 | 
18
+++++++++---------

1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkg/taldir/taldir.go b/pkg/taldir/taldir.go
@@ -978,8 +978,8 @@ func (t *Taldir) Initialize(cfg TaldirConfig) {
 		fmt.Println("Production mode enabled")
 	}
 
-	navTplFile := cfg.Ini.Section("taldir").Key("navigation").MustString(t.getFileName("web/templates/nav.html"))
-	footerTplFile := cfg.Ini.Section("taldir").Key("footer").MustString(t.getFileName("web/templates/footer.html"))
+	navTplFile := t.getFileName(cfg.Ini.Section("taldir").Key("navigation").MustString("web/templates/nav.html"))
+	footerTplFile := t.getFileName(cfg.Ini.Section("taldir").Key("footer").MustString("web/templates/footer.html"))
 	t.BaseURL = cfg.Ini.Section("taldir").Key("base_url").MustString("http://localhost:11000")
 	t.Validators = make(map[string]Validator)
 	for _, sec := range cfg.Ini.Sections() {
@@ -995,10 +995,10 @@ func (t *Taldir) Initialize(cfg TaldirConfig) {
 			t.Logger.Logf(LogWarning, "`type` key in section `[%s]` not found, disabling validator.\n", sec.Name())
 			continue
 		}
-		vlandingPageTplFile := sec.Key("registration_page").MustString(t.getFileName("web/templates/landing_" + vname + ".html"))
+		vlandingPageTplFile := t.getFileName(sec.Key("registration_page").MustString("web/templates/landing_" + vname + ".html"))
 		vlandingPageTpl, err := template.ParseFiles(vlandingPageTplFile, navTplFile, footerTplFile)
 		if err != nil {
-			t.Logger.Logf(LogWarning, "`%s` template not found, disabling validator `%s`.\n", vlandingPageTplFile, vname)
+			t.Logger.Logf(LogWarning, "`%s` template not found, disabling validator `%s`: `%v`\n", vlandingPageTplFile, vname, err)
 			continue
 		}
 		var v Validator
@@ -1068,31 +1068,31 @@ func (t *Taldir) Initialize(cfg TaldirConfig) {
 			time.Sleep(validationExp)
 		}
 	}()
-	imprintTplFile := cfg.Ini.Section("taldir").Key("imprint_page").MustString(t.getFileName("web/templates/imprint.html"))
+	imprintTplFile := t.getFileName(cfg.Ini.Section("taldir").Key("imprint_page").MustString("web/templates/imprint.html"))
 	t.ImprintTpl, err = template.ParseFiles(imprintTplFile, navTplFile, footerTplFile)
 	if err != nil {
 		t.Logger.InternalLogger.Fatal(err)
 		os.Exit(1)
 	}
-	validationLandingTplFile := cfg.Ini.Section("taldir").Key("validation_landing").MustString(t.getFileName("web/templates/validation_landing.html"))
+	validationLandingTplFile := t.getFileName(cfg.Ini.Section("taldir").Key("validation_landing").MustString("web/templates/validation_landing.html"))
 	t.ValidationTpl, err = template.ParseFiles(validationLandingTplFile, navTplFile, footerTplFile)
 	if err != nil {
 		t.Logger.InternalLogger.Fatal(err)
 		os.Exit(1)
 	}
-	landingTplFile := cfg.Ini.Section("taldir").Key("landing_page").MustString(t.getFileName("web/templates/landing.html"))
+	landingTplFile := t.getFileName(cfg.Ini.Section("taldir").Key("landing_page").MustString("web/templates/landing.html"))
 	t.LandingPageTpl, err = template.ParseFiles(landingTplFile, navTplFile, footerTplFile)
 	if err != nil {
 		t.Logger.InternalLogger.Fatal(err)
 		os.Exit(1)
 	}
-	lookupResultTplFile := cfg.Ini.Section("taldir").Key("lookup_result_page").MustString(t.getFileName("web/templates/lookup_result.html"))
+	lookupResultTplFile := t.getFileName(cfg.Ini.Section("taldir").Key("lookup_result_page").MustString("web/templates/lookup_result.html"))
 	t.LookupResultPageTpl, err = template.ParseFiles(lookupResultTplFile, navTplFile, footerTplFile)
 	if err != nil {
 		t.Logger.InternalLogger.Fatal(err)
 		os.Exit(1)
 	}
-	aboutTplFile := cfg.Ini.Section("taldir").Key("about_page").MustString(t.getFileName("web/templates/about.html"))
+	aboutTplFile := t.getFileName(cfg.Ini.Section("taldir").Key("about_page").MustString("web/templates/about.html"))
 	t.AboutPageTpl, err = template.ParseFiles(aboutTplFile, navTplFile, footerTplFile)
 	if err != nil {
 		t.Logger.InternalLogger.Fatal(err)