D3159.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3159.diff
View Options

	diff --git a/pillar/devserver/datacubes.sls b/pillar/devserver/datacubes.sls
	--- a/pillar/devserver/datacubes.sls
	+++ b/pillar/devserver/datacubes.sls
	@@ -24,3 +24,18 @@
	user: xcombelle
	zfs_user: xcombelle
	zfs_auto_snapshot: True
	+
	+# -------------------------------------------------------------
	+# Other directories needed by development work
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+
	+devserver_directories:
	+ /var/dataroot:
	+ user: root
	+ group: ops
	+ mode: 775
	+
	+ /var/dataroot/mediawiki.dereckson.be:
	+ user: web-be-dereckson-mw
	+ group: dereckson
	+ mode: 771
	diff --git a/roles/devserver/datacube/init.sls b/roles/devserver/datacube/init.sls
	--- a/roles/devserver/datacube/init.sls
	+++ b/roles/devserver/datacube/init.sls
	@@ -63,3 +63,20 @@

	{% endfor %}
	{% endif %}
	+
	+# -------------------------------------------------------------
	+# Misc directories
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+
	+{% for dir, args in pillar.get("devserver_directories", {}).items() %}
	+
	+{{ dir }}:
	+ file.directory:
	+ - makedirs: True
	+ {% for key in ["user", "group", "mode"] %}
	+ {% if key in args %}
	+ - {{ key }}: {{ args[key] }}
	+ {% endif %}
	+ {% endfor %}
	+
	+{% endfor %}