D1312.id3366.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1312.id3366.diff
View Options

	diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
	--- a/pillar/webserver/sites.sls
	+++ b/pillar/webserver/sites.sls
	@@ -50,6 +50,7 @@
	command: /usr/local/sbin/php-fpm

	web_php_sites:
	+ # Nasqueron members
	www.dereckson.be:
	user: web-be-dereckson-www
	source: wwwroot/dereckson.be/www
	@@ -57,6 +58,11 @@
	autochmod: True
	php-fpm: prod

	+ # Directly managed by Nasqueron
	+ api.nasqueron.org:
	+ user: web-org-nasqueron-api-serverslog
	+ php-fpm: prod
	+
	# -------------------------------------------------------------
	# States
	#
	diff --git a/roles/webserver-legacy/php-sites/files.sls b/roles/webserver-legacy/php-sites/files.sls
	--- a/roles/webserver-legacy/php-sites/files.sls
	+++ b/roles/webserver-legacy/php-sites/files.sls
	@@ -11,6 +11,8 @@

	{% for domain, site in pillar['web_php_sites'].iteritems() %}

	+{% if 'target' in site %}
	+
	{{ site['target'] }}:
	file.recurse:
	- source: salt://{{ site['source'] }}
	@@ -21,4 +23,6 @@
	- user: {{ site['user'] }}
	- group: web

	+{% endif %}
	+
	{% endfor %}