projects
/
noc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ansible/gpg: Add aveexy
[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
b8b796a
..
fd9f39c
100644
(file)
--- a/
ansible/host_vars/torwaechter/main.yml
+++ b/
ansible/host_vars/torwaechter/main.yml
@@
-1,4
+1,6
@@
---
---
+ssh_users_tuergit: "{{ user_groups.noc | union(['fgenesis','d3','ruru']) }}"
+
openwrt_arch: x86
openwrt_target: geode
openwrt_output_image_suffixes:
openwrt_arch: x86
openwrt_target: geode
openwrt_output_image_suffixes:
@@
-7,6
+9,7
@@
openwrt_output_image_suffixes:
openwrt_packages_extra:
- "-dropbear"
openwrt_packages_extra:
- "-dropbear"
+ - hwclock
- flashrom
- git
- kmod-usb-acm
- flashrom
- git
- kmod-usb-acm
@@
-30,11
+33,15
@@
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/sudoers.d/tuergitflash:
+ mode: '0440'
+ file: "{{ global_files_dir }}/{{ inventory_hostname }}/tuergitflash"
/etc/ssh/sshd_config:
content: |
/etc/ssh/sshd_config:
content: |
@@
-57,16
+64,10
@@
openwrt_mixin:
AuthorizedKeysCommandUser tuergit
/etc/ssh/authorized_keys.d/root:
AuthorizedKeysCommandUser tuergit
/etc/ssh/authorized_keys.d/root:
- content: |-
- {% for key in noc_ssh_keys %}
- {{ key }}
- {% endfor %}
+ content: "{{ ssh_users_root | user_ssh_keys(users) | join('\n') }}\n"
/etc/ssh/authorized_keys.d/tuergit:
/etc/ssh/authorized_keys.d/tuergit:
- content: |-
- {% for key in noc_ssh_keys %}
- {{ key }}
- {% endfor %}
+ content: "{{ ssh_users_tuergit | user_ssh_keys(users) | join('\n') }}\n"
openwrt_uci:
system:
openwrt_uci:
system:
@@
-100,15
+101,15
@@
openwrt_uci:
ipaddr: 127.0.0.1
netmask: 255.0.0.0
ipaddr: 127.0.0.1
netmask: 255.0.0.0
- - name: interface 'lan'
+ - name: interface 'mgmt'
options:
ifname: eth0
accept_ra: 0
proto: static
options:
ifname: eth0
accept_ra: 0
proto: static
- ipaddr: 192.168.33.7
- netmask: 255.255.255.0
- gateway: 192.168.33.1
- dns: 192.168.33.1
+ ipaddr: "{{ net.mgmt.prefix | ipaddr(100) | ipaddr('address') }}"
+ netmask: "{{ net.mgmt.prefix | ipaddr('netmask') }}"
+ gateway: "{{ net.mgmt.gw }}"
+ dns: "{{ net.mgmt.dns | join(' ') }}"
dns_search: realraum.at
dns_search: realraum.at