commit 603d0190293d4efa406da1859c0f9986ae723a63
parent 2496073b913bf901808d1080bd000401e77fa975
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Wed, 6 Dec 2023 21:18:11 +0100
Cleanup unused config
Diffstat:
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/gns-registrar.conf b/gns-registrar.conf
@@ -1,20 +1,19 @@
[gns-registrar]
production = false
-host = "https://taldir.gnunet.org"
+base_url = "http://localhost:7776"
+base_url_gnunet = "http://localhost:7776"
+gnunet_auth = ""
+base_url_merchant = https://backend.demo.taler.net
+merchant_token = sandbox
bind_to = "localhost:11000"
delegations_public = no
-monthly_fee = KUDOS:1
default_doc_filetype = text/html
default_doc_lang = en
default_tos_path = terms/
default_pp_path = privacy/
supported_doc_filetypes = text/html application/pdf application/epub application/xml text/plain
-merchant_baseurl_private = https://backend.demo.taler.net
-merchant_token = sandbox
registrar_landing = web/templates/landing.html
registrar_name = web/templates/name.html
registration_failed = templates/registration_failed.html
-registration_duration = 1y
root_zone_name = test
suffix_hint = gnunet.gns.alt
-registration_policy = fcfs
diff --git a/pkg/rest/gnsregistrar.go b/pkg/rest/gnsregistrar.go
@@ -571,7 +571,7 @@ func (t *Registrar) Initialize(cfgfile string) {
t.BaseUrl = t.Cfg.Section("gns-registrar").Key("base_url").MustString("http://localhost:11000")
t.SuffixHint = t.Cfg.Section("gns-registrar").Key("suffix_hint").MustString("example.alt")
t.RootZoneName = t.Cfg.Section("gns-registrar").Key("root_zone_name").MustString("test")
- t.GnunetUrl = t.Cfg.Section("gns-registrar").Key("gnunet_baseurl_private").MustString("http://localhost:7776")
+ t.GnunetUrl = t.Cfg.Section("gns-registrar").Key("base_url_gnunet").MustString("http://localhost:7776")
resp, err := http.Get(t.GnunetUrl + "/identity/name/" + t.RootZoneName)
if err != nil {
fmt.Printf("Failed to get zone key")
@@ -597,7 +597,7 @@ func (t *Registrar) Initialize(cfgfile string) {
fmt.Printf("Failed to get zone contents" + err.Error())
os.Exit(1)
}
- merchURL := t.Cfg.Section("gns-registrar").Key("merchant_baseurl_private").MustString("https://backend.demo.taler.net")
+ merchURL := t.Cfg.Section("gns-registrar").Key("base_url_merchant").MustString("https://backend.demo.taler.net")
merchToken := t.Cfg.Section("gns-registrar").Key("merchant_token").MustString("sandbox")
t.Merchant = merchant.NewMerchant(merchURL, merchToken)
t.setupHandlers()
