From 5041cdfc6eb01583478aa59f32924d1c75a28b7f Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 14 Apr 2019 19:45:48 +0200 Subject: [PATCH] cpe: prepare ap39 --- salt-pillar/cpe/aps.sls | 26 ++++++++++++++++++++++++++ salt/cpe/ap.sh | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls index 7aebe0c..d445ff8 100644 --- a/salt-pillar/cpe/aps.sls +++ b/salt-pillar/cpe/aps.sls @@ -1668,3 +1668,29 @@ cpe: HOgoE+WsqUs= =JG+0 -----END PGP MESSAGE----- + + ap39: + firstboot: True + password: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQgAh6taDhAQqdz/2KjAXIQ1KOC3mHDvQx1zZxgBis62WSTI + 0k4bKx0cmJ7YOGQN8Qn24b8INJTZelXOLDA704ykp1rK+8w5ceE+jh/PoxqO3NAi + vOv9IaXwOLSx2amR5M725spxUZ/GYLZDLgHYA6f39fTdkTp4M+40KThih6GsK6qC + No+V3XdBzZAxiBp0fzy5jQxMUy+g0Kccmzs5cOjBuDgrRLzx4XFG/+Jmm9/jEW2P + Vn0jzhh6vF4tx9ibUSbfYRDOK+YC/JNiO3tfwHq+ANfu+rdB2N6AnRYv0jb1NElG + 5OnJCHP1MHaCeKnDmCVL1WS+ew4swZTh2zOKFdcb39JDAUBSHfDFC9aY9o+kMqyM + TJ48n+TS4wEn/M/BaMfdAxA3B4kztJs/mfTOFi1ToJFOP1D3OSyE41wQhuuugUaR + dq+HHA== + =Sc0n + -----END PGP MESSAGE----- + model: DIR-615D4 + location: 'private' + lan-access: pub + radios: + 'platform/10180000.wmac': + channel: 9 + htmode: HT40+ + ssids: + 'ZW public': + net: pub diff --git a/salt/cpe/ap.sh b/salt/cpe/ap.sh index 73d6671..b96ab0e 100644 --- a/salt/cpe/ap.sh +++ b/salt/cpe/ap.sh @@ -301,7 +301,8 @@ set network.{{ net }}.proto=static set network.{{ net }}.ifname='{{ 'eth0.' ~ pillar['vlans'][net] }}' {%- endfor %} -{%- elif conf['model'] == 'DIR-615H1' %} +{%- elif conf['model'] == 'DIR-615H1' or conf['model'] == 'DIR-615D4' %} +{# All DIR-615 share the same port layout #} delete network.lan_dev delete network.wan_dev {# switch is cpu port 6, wan:cpu port 4, lan port 1 is cpu port 3, lan port 2 is 2 etc #}