diff --git a/salt/pillars/network.sls b/salt/pillars/network.sls index 1866339..f96ae8c 100644 --- a/salt/pillars/network.sls +++ b/salt/pillars/network.sls @@ -5,7 +5,7 @@ network: wireless: wlan0 # not to be managed by NetworkManager bridge: br0 # hostapd will create this bridgeport 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 rmt: 1 ntp: 1 @@ -19,15 +19,15 @@ network: vlan: - id: 100 - address: 192.168.100.1 + address: 172.18.100.1 zone: public - id: 200 - address: 192.168.200.1 + address: 172.18.200.1 zone: public - id: 250 - address: 192.168.250.1 + address: 172.18.250.1 zone: airgap wol: 1: 7c:10:c9:50:17:9b diff --git a/salt/states/remote-desktop/init.sls b/salt/states/remote-desktop/init.sls index e700eb6..e38bdcd 100644 --- a/salt/states/remote-desktop/init.sls +++ b/salt/states/remote-desktop/init.sls @@ -20,6 +20,7 @@ Set vnc password if no passwd file: Check that passwd file has correct settings: file.managed: - name: /home/{{ pillar['username'] }}/.vnc/passwd + - replace: False - user: {{ pillar['username'] }} - group: users - mode: "0600"