D1721.diff
No OneTemporary
Actions

Size

912 B

Referenced Files

None

Subscribers

None

D1721.diff
View Options

	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -63,6 +63,7 @@
	cachet:
	app_port: 39080
	host: status.nasqueron.org
	+ credential: 47
	mysql_link: acquisitariat
	etherpad:
	app_port: 34080
	diff --git a/roles/paas-docker/containers/cachet.sls b/roles/paas-docker/containers/cachet.sls
	--- a/roles/paas-docker/containers/cachet.sls
	+++ b/roles/paas-docker/containers/cachet.sls
	@@ -26,8 +26,8 @@
	- environment:
	- DB_HOST: mysql
	- DB_DATABASE: cachet
	- - DB_USERNAME: {{ salt['zr.get_username'](47) }}
	- - DB_PASSWORD: {{ salt['zr.get_password'](47) }}
	+ - DB_USERNAME: {{ salt['zr.get_username'](container['credential']) }}
	+ - DB_PASSWORD: {{ salt['zr.get_password'](container['credential']) }}
	- ports:
	- 80
	- port_bindings: