Skip to content

Commit 773aab6

Browse files
mattiaswalmattiaswal
committed
factory-config.cfg: Update all static factory-config.cfg to the new syntax in ietf-netconf
1 parent 542fd40 commit 773aab6

File tree

4 files changed

+172
-73
lines changed
  • board

4 files changed

+172
-73
lines changed

‎board/aarch32/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,31 @@
4141
"ietf-ip:ipv4": {
4242
"infix-dhcp-client:dhcp": {
4343
"option": [
44-
{"id": "netmask"},
45-
{"id": "broadcast"},
46-
{"id": "router"},
47-
{"id": "domain"},
48-
{"id": "hostname"},
49-
{"id": "dns-server"},
50-
{"id": "ntp-server"},
51-
{"id": "vendor-class", "value": "Raspberry Pi 2 Model B"}
44+
{
45+
"id": "netmask"
46+
},
47+
{
48+
"id": "broadcast"
49+
},
50+
{
51+
"id": "router"
52+
},
53+
{
54+
"id": "domain"
55+
},
56+
{
57+
"id": "hostname"
58+
},
59+
{
60+
"id": "dns-server"
61+
},
62+
{
63+
"id": "ntp-server"
64+
},
65+
{
66+
"id": "vendor-class",
67+
"value": "Raspberry Pi 2 Model B"
68+
}
5269
]
5370
}
5471
}
@@ -122,7 +139,11 @@
122139
"name": "default-ssh",
123140
"ssh": {
124141
"tcp-server-parameters": {
125-
"local-address": "::"
142+
"local-bind": [
143+
{
144+
"local-address": "::"
145+
}
146+
]
126147
},
127148
"ssh-server-parameters": {
128149
"server-identity": {
@@ -168,7 +189,7 @@
168189
"infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo="
169190
},
170191
"infix-meta:meta": {
171-
"version": "1.6"
192+
"version": "1.7"
172193
},
173194
"infix-services:mdns": {
174195
"enabled": true

‎board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg‎

Lines changed: 55 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -102,24 +102,49 @@
102102
"ietf-ip:ipv4": {
103103
"infix-dhcp-client:dhcp": {
104104
"option": [
105-
{"id": "ntp-server"},
106-
{"id": "broadcast"},
107-
{"id": "domain"},
108-
{"id": "hostname"},
109-
{"id": "dns-server"},
110-
{"id": "router"},
111-
{"id": "netmask"},
112-
{"id": "vendor-class", "value": "Banana Pi BPI-R3"}
105+
{
106+
"id": "ntp-server"
107+
},
108+
{
109+
"id": "broadcast"
110+
},
111+
{
112+
"id": "domain"
113+
},
114+
{
115+
"id": "hostname"
116+
},
117+
{
118+
"id": "dns-server"
119+
},
120+
{
121+
"id": "router"
122+
},
123+
{
124+
"id": "netmask"
125+
},
126+
{
127+
"id": "vendor-class",
128+
"value": "Banana Pi BPI-R3"
129+
}
113130
]
114131
}
115132
},
116133
"ietf-ip:ipv6": {
117134
"infix-dhcpv6-client:dhcp": {
118135
"option": [
119-
{"id": "ntp-server"},
120-
{"id": "client-fqdn"},
121-
{"id": "domain-search"},
122-
{"id": "dns-server"}
136+
{
137+
"id": "ntp-server"
138+
},
139+
{
140+
"id": "client-fqdn"
141+
},
142+
{
143+
"id": "domain-search"
144+
},
145+
{
146+
"id": "dns-server"
147+
}
123148
]
124149
}
125150
}
@@ -135,18 +160,18 @@
135160
]
136161
},
137162
"ietf-keystore:keystore": {
138-
"asymmetric-keys": {
139-
"asymmetric-key": [
140-
{
141-
"name": "genkey",
142-
"public-key-format": "infix-crypto-types:ssh-public-key-format",
143-
"public-key": "",
144-
"private-key-format": "infix-crypto-types:rsa-private-key-format",
145-
"cleartext-private-key": "",
146-
"certificates": {}
147-
}
148-
]
163+
"asymmetric-keys": {
164+
"asymmetric-key": [
165+
{
166+
"name": "genkey",
167+
"public-key-format": "infix-crypto-types:ssh-public-key-format",
168+
"public-key": "",
169+
"private-key-format": "infix-crypto-types:rsa-private-key-format",
170+
"cleartext-private-key": "",
171+
"certificates": {}
149172
}
173+
]
174+
}
150175
},
151176
"ietf-netconf-acm:nacm": {
152177
"enable-nacm": true,
@@ -201,7 +226,11 @@
201226
"name": "default-ssh",
202227
"ssh": {
203228
"tcp-server-parameters": {
204-
"local-address": "::"
229+
"local-bind": [
230+
{
231+
"local-address": "::"
232+
}
233+
]
205234
},
206235
"ssh-server-parameters": {
207236
"server-identity": {
@@ -293,7 +322,7 @@
293322
"policy": [
294323
{
295324
"name": "lan-to-wan",
296-
"action": "accept",
325+
"action": "accept",
297326
"ingress": [
298327
"lan"
299328
],
@@ -305,7 +334,7 @@
305334
]
306335
},
307336
"infix-meta:meta": {
308-
"version": "1.6"
337+
"version": "1.7"
309338
},
310339
"infix-services:mdns": {
311340
"enabled": true
@@ -341,4 +370,3 @@
341370
}
342371
}
343372
}
344-

‎board/aarch64/friendlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/factory-config.cfg‎

Lines changed: 55 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -61,43 +61,68 @@
6161
"ietf-ip:ipv4": {
6262
"infix-dhcp-client:dhcp": {
6363
"option": [
64-
{"id": "ntp-server"},
65-
{"id": "broadcast"},
66-
{"id": "domain"},
67-
{"id": "hostname"},
68-
{"id": "dns-server"},
69-
{"id": "router"},
70-
{"id": "netmask"},
71-
{"id": "vendor-class", "value": "NanoPi R2S"}
64+
{
65+
"id": "ntp-server"
66+
},
67+
{
68+
"id": "broadcast"
69+
},
70+
{
71+
"id": "domain"
72+
},
73+
{
74+
"id": "hostname"
75+
},
76+
{
77+
"id": "dns-server"
78+
},
79+
{
80+
"id": "router"
81+
},
82+
{
83+
"id": "netmask"
84+
},
85+
{
86+
"id": "vendor-class",
87+
"value": "NanoPi R2S"
88+
}
7289
]
7390
}
7491
},
7592
"ietf-ip:ipv6": {
7693
"infix-dhcpv6-client:dhcp": {
7794
"option": [
78-
{"id": "ntp-server"},
79-
{"id": "client-fqdn"},
80-
{"id": "domain-search"},
81-
{"id": "dns-server"}
95+
{
96+
"id": "ntp-server"
97+
},
98+
{
99+
"id": "client-fqdn"
100+
},
101+
{
102+
"id": "domain-search"
103+
},
104+
{
105+
"id": "dns-server"
106+
}
82107
]
83108
}
84109
}
85110
}
86111
]
87112
},
88113
"ietf-keystore:keystore": {
89-
"asymmetric-keys": {
90-
"asymmetric-key": [
91-
{
92-
"name": "genkey",
93-
"public-key-format": "infix-crypto-types:ssh-public-key-format",
94-
"public-key": "",
95-
"private-key-format": "infix-crypto-types:rsa-private-key-format",
96-
"cleartext-private-key": "",
97-
"certificates": {}
98-
}
99-
]
114+
"asymmetric-keys": {
115+
"asymmetric-key": [
116+
{
117+
"name": "genkey",
118+
"public-key-format": "infix-crypto-types:ssh-public-key-format",
119+
"public-key": "",
120+
"private-key-format": "infix-crypto-types:rsa-private-key-format",
121+
"cleartext-private-key": "",
122+
"certificates": {}
100123
}
124+
]
125+
}
101126
},
102127
"ietf-netconf-acm:nacm": {
103128
"enable-nacm": true,
@@ -152,7 +177,11 @@
152177
"name": "default-ssh",
153178
"ssh": {
154179
"tcp-server-parameters": {
155-
"local-address": "::"
180+
"local-bind": [
181+
{
182+
"local-address": "::"
183+
}
184+
]
156185
},
157186
"ssh-server-parameters": {
158187
"server-identity": {
@@ -244,7 +273,7 @@
244273
"policy": [
245274
{
246275
"name": "lan-to-wan",
247-
"action": "accept",
276+
"action": "accept",
248277
"ingress": [
249278
"lan"
250279
],
@@ -256,7 +285,7 @@
256285
]
257286
},
258287
"infix-meta:meta": {
259-
"version": "1.6"
288+
"version": "1.7"
260289
},
261290
"infix-services:mdns": {
262291
"enabled": true

‎board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/factory-config.cfg‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,31 @@
4141
"ietf-ip:ipv4": {
4242
"infix-dhcp-client:dhcp": {
4343
"option": [
44-
{"id": "netmask"},
45-
{"id": "broadcast"},
46-
{"id": "router"},
47-
{"id": "domain"},
48-
{"id": "hostname"},
49-
{"id": "dns-server"},
50-
{"id": "ntp-server"},
51-
{"id": "vendor-class", "value": "Raspberry Pi 4 Model B"}
44+
{
45+
"id": "netmask"
46+
},
47+
{
48+
"id": "broadcast"
49+
},
50+
{
51+
"id": "router"
52+
},
53+
{
54+
"id": "domain"
55+
},
56+
{
57+
"id": "hostname"
58+
},
59+
{
60+
"id": "dns-server"
61+
},
62+
{
63+
"id": "ntp-server"
64+
},
65+
{
66+
"id": "vendor-class",
67+
"value": "Raspberry Pi 4 Model B"
68+
}
5269
]
5370
}
5471
}
@@ -126,7 +143,11 @@
126143
"name": "default-ssh",
127144
"ssh": {
128145
"tcp-server-parameters": {
129-
"local-address": "::"
146+
"local-bind": [
147+
{
148+
"local-address": "::"
149+
}
150+
]
130151
},
131152
"ssh-server-parameters": {
132153
"server-identity": {
@@ -172,7 +193,7 @@
172193
"infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo="
173194
},
174195
"infix-meta:meta": {
175-
"version": "1.6"
196+
"version": "1.7"
176197
},
177198
"infix-services:mdns": {
178199
"enabled": true

0 commit comments

Comments
 (0)