D2944.id7497.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2944.id7497.diff
View Options

	diff --git a/_modules/credentials.py b/_modules/credentials.py
	--- a/_modules/credentials.py
	+++ b/_modules/credentials.py
	@@ -126,13 +126,10 @@
	if _are_credentials_hidden():
	return "credential for " + args["credential"]

	- host = __pillar__["sentry_realms"][args["realm"]]["host"]
	- credential = read_secret(args["credential"])
	+ host = __pillar__["sentry_realms"][args["realm"]]["hostname"]
	+ key = get_username(args["credential"])

	- return (
	- f"https://{credential['username']}:{credential['password']}"
	- f"@{host}/{args['project_id']}"
	- )
	+ return f"https://{key}@{host}/{args['project_id']}"


	# -------------------------------------------------------------
	diff --git a/roles/paas-docker/containers/notifications.sls b/roles/paas-docker/containers/notifications.sls
	--- a/roles/paas-docker/containers/notifications.sls
	+++ b/roles/paas-docker/containers/notifications.sls
	@@ -78,6 +78,8 @@

	- MAILGUN_DOMAIN: {{ salt['credentials.get_username'](container['credentials']['mailgun']) }}
	- MAILGUN_APIKEY: {{ salt['credentials.get_password'](container['credentials']['mailgun']) }}
	+
	+ - SENTRY_DSN: {{ salt['credentials.get_sentry_dsn'](container["sentry"]) }}
	- ports:
	- 80
	- port_bindings: