projects
/
noc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
introduce ssh_users_root
[noc.git]
/
ansible
/
host_vars
/
torwaechter
/
main.yml
diff --git
a/ansible/host_vars/torwaechter/main.yml
b/ansible/host_vars/torwaechter/main.yml
index
2a2316f
..
864a50d
100644
(file)
--- a/
ansible/host_vars/torwaechter/main.yml
+++ b/
ansible/host_vars/torwaechter/main.yml
@@
-1,4
+1,6
@@
---
---
+ssh_keys_tuergit: "{{ ssh_keys_root }}"
+
openwrt_arch: x86
openwrt_target: geode
openwrt_output_image_suffixes:
openwrt_arch: x86
openwrt_target: geode
openwrt_output_image_suffixes:
@@
-31,11
+33,11
@@
openwrt_mixin:
/usr/local/bin/authorized_keys.sh:
mode: '0755'
/usr/local/bin/authorized_keys.sh:
mode: '0755'
- file: "{{ global_artifacts_dir }}/{{ inventory_hostname }}/authorized_keys.sh"
+ file: "{{ global_files_dir }}/{{ inventory_hostname }}/authorized_keys.sh"
/usr/local/bin/update-keys-from-stdin.sh:
mode: '0755'
/usr/local/bin/update-keys-from-stdin.sh:
mode: '0755'
- file: "{{ global_artifacts_dir }}/{{ inventory_hostname }}/update-keys-from-stdin.sh"
+ file: "{{ global_files_dir }}/{{ inventory_hostname }}/update-keys-from-stdin.sh"
/etc/ssh/sshd_config:
content: |
/etc/ssh/sshd_config:
content: |
@@
-59,13
+61,13
@@
openwrt_mixin:
/etc/ssh/authorized_keys.d/root:
content: |-
/etc/ssh/authorized_keys.d/root:
content: |-
- {% for key in noc_ssh_keys %}
+ {% for key in ssh_keys_root %}
{{ key }}
{% endfor %}
/etc/ssh/authorized_keys.d/tuergit:
content: |-
{{ key }}
{% endfor %}
/etc/ssh/authorized_keys.d/tuergit:
content: |-
- {% for key in noc_ssh_keys %}
+ {% for key in ssh_keys_tuergit %}
{{ key }}
{% endfor %}
{{ key }}
{% endfor %}