jonas/tlu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Jonas Forsberg 2021-10-17 14:06:30 +02:00
parent 2c92cf35e9
commit 319c84835d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/pillars/network.sls
View File

@ -5,7 +5,7 @@ network:
wireless: wlan0 # not to be managed by NetworkManager wireless: wlan0 # not to be managed by NetworkManager
bridge: br0 # hostapd will create this bridgeport bridge: br0 # hostapd will create this bridgeport
external: eth1 external: eth1
ip: 192.168.0.1 # all networks are /24 ip: 172.18.0.1 # all networks are /24
hosts: # key=hostname to be added to /etc/hosts, value=last octate of IP hosts: # key=hostname to be added to /etc/hosts, value=last octate of IP
rmt: 1 rmt: 1
ntp: 1 ntp: 1
@ -19,15 +19,15 @@ network:
vlan: vlan:
- -
id: 100 id: 100
address: 192.168.100.1 address: 172.18.100.1
zone: public zone: public
- -
id: 200 id: 200
address: 192.168.200.1 address: 172.18.200.1
zone: public zone: public
- -
id: 250 id: 250
address: 192.168.250.1 address: 172.18.250.1
zone: airgap zone: airgap
wol: wol:
1: 7c:10:c9:50:17:9b 1: 7c:10:c9:50:17:9b

1
salt/states/remote-desktop/init.sls
View File

@ -20,6 +20,7 @@ Set vnc password if no passwd file:
Check that passwd file has correct settings: Check that passwd file has correct settings:
file.managed: file.managed:
- name: /home/{{ pillar['username'] }}/.vnc/passwd - name: /home/{{ pillar['username'] }}/.vnc/passwd
- replace: False
- user: {{ pillar['username'] }} - user: {{ pillar['username'] }}
- group: users - group: users
- mode: "0600" - mode: "0600"