commit 7d51bd7c48c5675b7d579cbe4cdc15e5e212ed29
parent 28346d8bb59135db2d2662433e51f4873d744d50
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Sun, 22 Mar 2026 08:04:34 +0100
uppercase config values in example
Diffstat:
2 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/cmd/taldir-server/main.go b/cmd/taldir-server/main.go
@@ -109,7 +109,7 @@ func main() {
log.Panic(err)
}
defer db.Close()
- merchURL := cfg.GetString("directory", "base_url_merchant", "https://backend.demo.taler.net")
+ merchURL := cfg.GetString("directory", "merchant_base_url", "https://backend.demo.taler.net")
merchToken := cfg.GetString("directory", "merchant_token", "sandbox")
t.Initialize(taldir.TaldirConfig{
Ini: cfg,
diff --git a/taler-directory.conf.example b/taler-directory.conf.example
@@ -1,55 +1,64 @@
[directory]
-footer = web/templates/footer.html
-base_url = http://localhost:11000
-challenge_bytes = 16
-validation_initiation_max = 3
-solution_attempt_max = 3
-validation_timeframe = 5m
-solution_attempt_timeframe = 1h
-monthly_fee = KUDOS:0
-purge_mappings_on_startup_dangerous = false
-validation_expiration = 24h
-validation_landing = web/templates/validation_landing.html
-landing_page = web/templates/landing.html
-lookup_result_page = web/templates/lookup_result.html
-salt = ChangeMe
+BASE_URL = http://localhost:11000
+FOOTER = web/templates/footer.html
+CHALLENGE_BYTES = 16
+VALIDATION_INITIATION_MAX = 3
+SOLUTION_ATTEMPT_MAX = 3
+VALIDATION_TIMEFRAME = 5m
+SOLUTION_ATTEMPT_TIMEFRAME = 1h
+MONTHLY_FEE = KUDOS:0
+PURGE_MAPPINGS_ON_STARTUP_DANGEROUS = false
+VALIDATION_EXPIRATION = 24h
+VALIDATION_LANDING = web/templates/validation_landing.html
+LANDING_PAGE = web/templates/landing.html
+LOOKUP_RESULT_PAGE = web/templates/lookup_result.html
+SALT = ChangeMe
+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_BASE_URL = "https://backend.demo.taler.net"
+MERCHANT_TOKEN = "sandbox"
+PURGE_MAPPINGS_ON_STARTUP_DANGEROUS = false
+VALID_PAYMENT_SYSTEM_ADDRESS_REGEX = ".*"
[directory-pq]
-connection_string = postgres:///taler-directory?host=/var/run/postgresql
+CONNECTION_STRING = postgres:///taler-directory?HOST=/var/run/postgresql
[directory-validator-email]
-type = command
-enabled = true
-command = test
-valid_alias_regex='^\S+@\S+\.\S+$'
+TYPE = command
+ENABLED = true
+COMMAND = test
+VALID_ALIAS_REGEX='^\S+@\S+\.\S+$'
[directory-validator-phone]
-type = command
-enabled = true
-command = test
+TYPE = command
+ENABLED = true
+COMMAND = test
[directory-validator-oidctest]
-type = oidc
-enabled = false
-authorization_endpoint=http://127.0.0.1:9400/oauth2/authorize
-token_endpoint=http://127.0.0.1:9400/oauth2/token
-userinfo_endpoint=http://127.0.0.1:9400/userinfo
-client_id=test
-client_secret=testsecret
-scope=openid email
-valid_alias_regex='^\S+@\S+\.\S+$'
-alias_claim=sub
+TYPE = oidc
+ENABLED = false
+AUTHORIZATION_ENDPOINT=http://127.0.0.1:9400/oauth2/authorize
+TOKEN_ENDPOINT=http://127.0.0.1:9400/oauth2/token
+USERINFO_ENDPOINT=http://127.0.0.1:9400/userinfo
+CLIENT_ID=test
+CLIENT_SECRET=testsecret
+SCOPE=openid email
+VALID_ALIAS_REGEX='^\S+@\S+\.\S+$'
+ALIAS_CLAIM=sub
[directory-validator-mastodon]
-type = oidc
-enabled = true
-authorization_endpoint=https://mastodon.social/oauth/authorize
-token_endpoint=https://mastodon.social/oauth/token
-userinfo_endpoint=https://mastodon.social/oauth/userinfo
-client_id=test
-client_secret=testsecret
-scope=profile
-valid_alias_regex='^\S+$'
-alias_claim="preferred_username"
+TYPE = oidc
+ENABLED = true
+AUTHORIZATION_ENDPOINT=https://mastodon.social/oauth/authorize
+TOKEN_ENDPOINT=https://mastodon.social/oauth/token
+USERINFO_ENDPOINT=https://mastodon.social/oauth/userinfo
+CLIENT_ID=test
+CLIENT_SECRET=testsecret
+SCOPE=profile
+VALID_ALIAS_REGEX='^\S+$'
+ALIAS_CLAIM="preferred_username"