D1762.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1762.diff
View Options

	diff --git a/pillar/credentials/zr.sls b/pillar/credentials/zr.sls
	--- a/pillar/credentials/zr.sls
	+++ b/pillar/credentials/zr.sls
	@@ -17,6 +17,7 @@
	# status.nasqueron.org
	cachet:
	mysql: 47
	+ app_key: 126

	# pad.nasqueron.org
	etherpad:
	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -146,6 +146,7 @@
	app_port: 39080
	host: status.nasqueron.org
	credential: nasqueron.cachet.mysql
	+ app_key: nasqueron.cachet.app_key
	mysql_link: acquisitariat

	etherpad:
	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
	@@ -22,16 +22,23 @@
	docker_container.running:
	- detach: True
	- interactive: True
	- - image: dereckson/cachet
	+ - image: cachethq/docker:latest
	- links: {{ container['mysql_link'] }}:mysql
	- environment:
	+ - DB_DRIVER: mysql
	- DB_HOST: mysql
	+ - DB_PORT: 3306
	- DB_DATABASE: cachet
	- DB_USERNAME: {{ salt['zr.get_username'](container['credential']) }}
	- DB_PASSWORD: {{ salt['zr.get_password'](container['credential']) }}
	+ - DB_PREFIX: ""
	+
	+ - APP_KEY: {{ salt['zr.get_token'](container['app_key']) }}
	+ - APP_LOG: errorlog
	+ - APP_DEBUG: "false"
	- ports:
	- - 80
	+ - 8000
	- port_bindings:
	- - {{ container['app_port'] }}:80
	+ - {{ container['app_port'] }}:8000

	{% endfor %}