From d95582f62bf62f2a342bc699b29c2b06d2a76ca7 Mon Sep 17 00:00:00 2001 From: unman Date: Thu, 12 Jan 2017 01:38:02 +0000 Subject: [PATCH 1/2] Add support for updates proxy in VPN doc QubesOS/Qubes-issues#2383 --- configuration/vpn.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configuration/vpn.md b/configuration/vpn.md index 72fa2eda..131a86df 100644 --- a/configuration/vpn.md +++ b/configuration/vpn.md @@ -202,6 +202,16 @@ Configure your AppVMs to use the VPN VM as a NetVM... ![Settings-NetVM.png](/attachment/wiki/VPN/Settings-NetVM.png) + +If you want to be able to use the qubes firewall, create a ProxyVM firewall and set it to use the VPN VM as NetVM. +Then configure AppVMs to use *that* firewall as their NetVM. + +If you want to update your Templates through the VPN, configure the ProxyVM firewall so as to enable the qubes-updates-proxy service. +You can do this using the services tab in the Manager or at the command line: +`qvm-service -e qubes-updates-proxy` +Then configure your templates to use the ProxyVM firewall as their NetVM. + + Troubleshooting --------------- From fa46feae1e3dbd84d016ad222b2fe796bdbc9c5b Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Wed, 11 Jan 2017 19:50:31 -0800 Subject: [PATCH 2/2] Revise for clarity, terminology, and orthography --- configuration/vpn.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/configuration/vpn.md b/configuration/vpn.md index 131a86df..c5dbe40c 100644 --- a/configuration/vpn.md +++ b/configuration/vpn.md @@ -203,13 +203,15 @@ Configure your AppVMs to use the VPN VM as a NetVM... ![Settings-NetVM.png](/attachment/wiki/VPN/Settings-NetVM.png) -If you want to be able to use the qubes firewall, create a ProxyVM firewall and set it to use the VPN VM as NetVM. -Then configure AppVMs to use *that* firewall as their NetVM. +If you want to be able to use the [Qubes firewall](/doc/firewall), create a new FirewallVM (as a ProxyVM) and set it to use the VPN VM as its NetVM. +Then, configure AppVMs to use your new FirewallVM as their NetVM. -If you want to update your Templates through the VPN, configure the ProxyVM firewall so as to enable the qubes-updates-proxy service. -You can do this using the services tab in the Manager or at the command line: -`qvm-service -e qubes-updates-proxy` -Then configure your templates to use the ProxyVM firewall as their NetVM. +If you want to update your TemplateVMs through the VPN, enable the `qubes-updates-proxy` service in your new FirewallVM. +You can do this in the Services tab in Qubes VM Manager or on the command-line: + + $ qvm-service -e qubes-updates-proxy + +Then, configure your templates to use your new FirewallVM as their NetVM. Troubleshooting