Skip to content

Commit fcc7cd5

Browse files
committed
docs: update with new passthrough format
1 parent 6743801 commit fcc7cd5

File tree

2 files changed

+36
-28
lines changed

2 files changed

+36
-28
lines changed

doc/netplan-everywhere.md

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,14 @@ network:
101101
uuid: "0f7a33ac-512e-4c03-b088-4db00fe3292e"
102102
name: "Ethernet connection 1"
103103
passthrough:
104-
ethernet._: ""
105-
ipv4.ignore-auto-dns: "true"
106-
ipv6.addr-gen-mode: "default"
107-
ipv6.method: "disabled"
108-
ipv6.ip6-privacy: "-1"
109-
proxy._: ""
104+
ethernet: {}
105+
ipv4:
106+
ignore-auto-dns: "true"
107+
ipv6:
108+
addr-gen-mode: "default"
109+
method: "disabled"
110+
ip6-privacy: "-1"
111+
proxy: {}
110112
```
111113
112114
All the configuration under the `passthrough` mapping is added to
@@ -126,17 +128,21 @@ network:
126128
uuid: "db5f0f67-1f4c-4d59-8ab8-3d278389cf87"
127129
name: "myvpnconnection"
128130
passthrough:
129-
connection.type: "vpn"
130-
vpn.ca: "path to ca.crt"
131-
vpn.cert: "path to client.crt"
132-
vpn.cipher: "AES-256-GCM"
133-
vpn.connection-type: "tls"
134-
vpn.dev: "tun"
135-
vpn.key: "path to client.key"
136-
vpn.remote: "1.2.3.4:1194"
137-
vpn.service-type: "org.freedesktop.NetworkManager.openvpn"
138-
ipv4.method: "auto"
139-
ipv6.addr-gen-mode: "default"
140-
ipv6.method: "auto"
141-
proxy._: ""
131+
connection:
132+
type: "vpn"
133+
vpn:
134+
ca: "path to ca.crt"
135+
cert: "path to client.crt"
136+
cipher: "AES-256-GCM"
137+
connection-type: "tls"
138+
dev: "tun"
139+
key: "path to client.key"
140+
remote: "1.2.3.4:1194"
141+
service-type: "org.freedesktop.NetworkManager.openvpn"
142+
ipv4:
143+
method: "auto"
144+
ipv6:
145+
addr-gen-mode: "default"
146+
method: "auto"
147+
proxy: {}
142148
```

doc/netplan-yaml.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2146,15 +2146,17 @@ network:
21462146
uuid: "db5f0f67-1f4c-4d59-8ab8-3d278389cf87"
21472147
name: "myvpnconnection"
21482148
passthrough:
2149-
connection.type: "vpn"
2150-
vpn.ca: "path to ca.crt"
2151-
vpn.cert: "path to client.crt"
2152-
vpn.cipher: "AES-256-GCM"
2153-
vpn.connection-type: "tls"
2154-
vpn.dev: "tun"
2155-
vpn.key: "path to client.key"
2156-
vpn.remote: "1.2.3.4:1194"
2157-
vpn.service-type: "org.freedesktop.NetworkManager.openvpn"
2149+
connection:
2150+
type: "vpn"
2151+
vpn:
2152+
ca: "path to ca.crt"
2153+
cert: "path to client.crt"
2154+
cipher: "AES-256-GCM"
2155+
connection-type: "tls"
2156+
dev: "tun"
2157+
key: "path to client.key"
2158+
remote: "1.2.3.4:1194"
2159+
service-type: "org.freedesktop.NetworkManager.openvpn"
21582160
```
21592161

21602162
## Back end-specific configuration parameters

0 commit comments

Comments
 (0)