D2797.id7103.diff
No OneTemporary
Actions

Size

911 B

Referenced Files

None

Subscribers

None

D2797.id7103.diff
View Options

	diff --git a/roles/core/users/files/authorized_keys b/roles/core/users/files/authorized_keys
	--- a/roles/core/users/files/authorized_keys
	+++ b/roles/core/users/files/authorized_keys
	@@ -19,3 +19,5 @@
	# </auto-generated>
	{% for key in keys %}
	{{ key }}{% endfor %}
	+{% for key in keys_forest %}
	+{{ key }}{% endfor %}
	diff --git a/roles/core/users/init.sls b/roles/core/users/init.sls
	--- a/roles/core/users/init.sls
	+++ b/roles/core/users/init.sls
	@@ -25,6 +25,7 @@

	{% set users = salt['forest.get_users']() %}
	{% set zfs_tank = salt['node.get']("zfs:pool") %}
	+{% set forest = salt['node.get']['forest'] %}

	# -------------------------------------------------------------
	# Disabled accounts
	@@ -131,5 +132,6 @@
	- template: jinja
	- context:
	keys: {{ user['ssh_keys']\|default([]) }}
	+ keys_forest: {{ user['ssh_key_by_forests'][forest]\|default([]) }}

	{% endfor %}