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

.

Browse Source
This commit is contained in:
jonas 2021-10-18 08:26:26 +02:00
parent de1f37983b
commit 7f0b81f7ac
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/states/hostapd/init.sls
View File

@ -6,7 +6,7 @@ Set {{ pillar['network']['wireless'] }} to not be managed by NetworkManager:
Delete {{ pillar['network']['interface'] }} connection: Delete {{ pillar['network']['interface'] }} connection:
cmd.run: cmd.run:
- name: nmcli connection delete {{ pillar['network']['interface'] }} - name: nmcli connection delete {{ pillar['network']['interface'] }}
- unless: nmcli connection show {{ pillar['network']['interface'] }} > /dev/null - onlyif: nmcli connection show {{ pillar['network']['interface'] }} > /dev/null
Install hostapd: Install hostapd:
pkg.installed: pkg.installed:

2
salt/states/top.sls
View File

@ -2,6 +2,7 @@ base:
'*': '*':
- hosts - hosts
- vlan - vlan
- hostapd
- firewalld - firewalld
- ssh - ssh
- chrony - chrony
@ -13,5 +14,4 @@ base:
- podman - podman
- docker.registry - docker.registry
- remote-desktop - remote-desktop
- hostapd
- wol - wol

4
salt/states/vlan/init.sls
View File

@ -8,12 +8,12 @@ create device {{ ifname }}:
set ip address on {{ ifname }}: set ip address on {{ ifname }}:
cmd.run: cmd.run:
- name: nmcli connection modify {{ ifname }} ipv4.addresses {{ vlan['address'] }}/24 - name: nmcli connection modify {{ ifname }} ipv4.addresses {{ vlan['address'] }}/24
- unless: bash -c "if [[ \"$(nmcli connection show Wired\ connection\ 1 | sed -n 's/^ipv4.addresses.\s*\(.*\)$/\1/p')\" == "{{ vlan['address'] }}/24" ]]; then exit 0; else exit 1;fi" - unless: bash -c "if [[ \"$(nmcli connection show {{ ifname }} | sed -n 's/^ipv4.addresses.\s*\(.*\)$/\1/p')\" == "{{ vlan['address'] }}/24" ]]; then exit 0; else exit 1;fi"
set ip static on {{ ifname }}: set ip static on {{ ifname }}:
cmd.run: cmd.run:
- name: nmcli connection modify {{ ifname }} ipv4.method manual - name: nmcli connection modify {{ ifname }} ipv4.method manual
- unless: bash -c "if [[ \"$(nmcli connection show Wired\ connection\ 1 | sed -n 's/^ipv4.method.\s*\(.*\)$/\1/p')\" == "manual" ]]; then exit 0; else exit 1;fi" - unless: bash -c "if [[ \"$(nmcli connection show {{ ifname }} | sed -n 's/^ipv4.method.\s*\(.*\)$/\1/p')\" == "manual" ]]; then exit 0; else exit 1;fi"
bring up {{ ifname }}: bring up {{ ifname }}:
cmd.run: cmd.run: