D1446.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1446.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
	@@ -70,6 +70,17 @@
	env:
	SERVERS_LOG_FILE: /srv/api/data/servers-log-all.json

	+ wikis.nasqueron.org:
	+ domain: nasqueron.org
	+ subdomain: wikis
	+ user: mediawiki
	+ php-fpm: prod
	+ skipCreateAccount: True
	+ env:
	+ MEDIAWIKI_ENTRY_POINT: /srv/mediawiki/index.php
	+ DB_HOST: 127.0.0.1
	+ DB_USER: mediawiki-saas
	+
	# -------------------------------------------------------------
	# States
	#
	diff --git a/roles/webserver-legacy/php-sites/account.sls b/roles/webserver-legacy/php-sites/account.sls
	--- a/roles/webserver-legacy/php-sites/account.sls
	+++ b/roles/webserver-legacy/php-sites/account.sls
	@@ -10,6 +10,7 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% for domain, site in pillar['web_php_sites'].items() %}
	+{% if 'skipCreateAccount' not in site or not site['skipCreateAccount'] %}

	web_account_{{ site['user'] }}:
	user.present:
	@@ -19,4 +20,5 @@
	- system: True
	- home: /var/run/web/{{ domain }}

	+{% endif %}
	{% endfor %}