From bbe72bc7504e23e3e596b13ca58afd525b3281ec Mon Sep 17 00:00:00 2001 From: nastaziya Date: Sat, 10 Aug 2019 08:50:32 -0400 Subject: [PATCH 1/4] fixed mistype errors --- external/os-guides/centos/centos-minimal.md | 20 ++++++++++---------- external/os-guides/centos/centos.md | 2 +- user/managing-os/fedora/fedora-xfce.md | 2 +- user/managing-os/fedora/fedora.md | 2 +- user/managing-os/templates.md | 1 + 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/external/os-guides/centos/centos-minimal.md b/external/os-guides/centos/centos-minimal.md index 6caba1dd..67fe7faa 100644 --- a/external/os-guides/centos/centos-minimal.md +++ b/external/os-guides/centos/centos-minimal.md @@ -1,12 +1,12 @@ --- layout: doc -title: CentOS Template +title: CentOS Minimal Template permalink: /doc/templates/centos-minimal/ --- # CentOS Minimal Template -The minimal CentOS images use the standard CentOS installer with all of its regular features minus the selection of packages, thus keeping only the most essential ones, including the xterm terminal emulator. Yum is completed and can be used to add or remove packages, right after the Template installation. +The minimal CentOS images use the standard CentOS installer with all of its regular features minus the selection of packages, thus keeping only the most essential ones, including the xterm terminal emulator. `yum` is completed and can be used to add or remove packages, right after the template installation. The CentOS Minimal template is intended only for advanced users and requires some familiarity with the command line and basics of Qubes. @@ -23,7 +23,7 @@ Customization ### Clone -It is highly recommended not to make any changes in the original template, but use a **clone** instead. The following command clones the template. (Replace your-new-clone with your desired name.) +It is highly recommended not to make any changes in the original template, but use a **clone** instead. The following command clones the template. (Replace `your-new-clone` with your desired name.) ~~~ [user@dom0 ~]$ qvm-clone centos-7-minimal your-new-clone @@ -31,7 +31,7 @@ It is highly recommended not to make any changes in the original template, but u You must start the template in order to customize it. -**Customizing** the template for specific use cases normally requires installing additional packages. In the running template, use yum to install the required packages as follows(replace packages with a space-delimited list of packages to be installed): +**Customizing** the template for specific use cases normally requires installing additional packages. In the running template, use yum to install the required packages as follows (replace packages with a space-delimited list of `packages` to be installed): ~~~ [user@your-new-clone ~]$ sudo yum install packages @@ -39,7 +39,7 @@ You must start the template in order to customize it. ### Passwordless root -Before starting to install packages in your template, it is worthy of mention that in Qubes R4.0, the minimal template is not configured for passwordless root. +Before starting to install packages in your template, it is worthy of mention that in Qubes, the minimal template is not configured for passwordless root. To update or install packages to it, from a dom0 terminal window run: ~~~ @@ -48,7 +48,7 @@ To update or install packages to it, from a dom0 terminal window run: to open a root terminal in the template, from which you can use yum without sudo. You will have to do this every time if you choose not to enable passwordless root. -If you want the usual CentoOS qubes `sudo yum ...` commands, open the root terminal just this once using the above command, and in the root xterm window enter +If you want the usual CentOS qubes `sudo yum ...` commands, open the root terminal just this once using the above command, and in the root xterm window enter ~~~ bash-4.4# yum install qubes-core-agent-passwordless-root polkit @@ -60,7 +60,7 @@ Optionally check this worked: from the gui open the minimal template's xterm and [user@cent-min-clone ~]$ sudo -l ~~~ -which should give you output that includes the NOPASSWD keyword. +which should give you output that includes the `NOPASSWD` keyword. From this point, your template is ready to be customized. @@ -74,12 +74,12 @@ Use case | Description | Required steps **Networking** | If you want networking | Install qubes-core-agent-networking **Audio** | If you want sound from your VM... | Install `pulseaudio-qubes` **FirewallVM** | You can use the minimal template as a template for a [FirewallVM](/doc/firewall/), like `sys-firewall` | Install `qubes-core-agent-networking`, and `nftables`. Also install `qubes-core-agent-dom0-updates`(script required to handle `dom0` updates), if you want to use a qube based on the template as an updateVM (normally sys-firewall). -**NetVM** | You can use this template as the basis for a NetVM such as `sys-net` | Install the following packages: `qubes-core-agent-networking`, `qubes-core-agent-network-manager`, and `nftables`. +**NetVM** | You can use this template as the basis for a NetVM such as `sys-net` | Install the following packages: `qubes-core-agent-networking`, `qubes-core-agent-network-manager` and `nftables`. **NetVM (extra firmware)** | If your network devices need extra packages for a network VM | Use the `lspci` command to identify the devices, then find the package that provides necessary firnware and install it. **Network utilities** | If you need utilities for debugging and analyzing network connections | Install the following packages: `tcpdump` `telnet` `nmap` `nmap-ncat` **USB** | If you want to use this template as the basis for a [USB](/doc/usb/) qube such as `sys-usb` | Install `qubes-usb-proxy`. To use USB mouse or keyboard install `qubes-input-proxy-sender`. **VPN** | You can use this template as basis for a [VPN](/doc/vpn/) qube | You may need to install network-manager VPN packages, depending on the VPN technology you'll be using. After creating a machine based on this template, follow the [VPN howto](/doc/vpn/#set-up-a-proxyvm-as-a-vpn-gateway-using-networkmanager) to configure it. -**Desktop environment** | To improve desktop experience using additional packages from the `qubes-core-agent` | `qubes-menus `which defines menu layout, `qubes-desktop-linux-common` which contains icons and scripts to improve desktop experience. `qubes-core-agent-nautilus`/`qubes-core-agent-thunar`: packages providing integration with the Nautilus/Thunar file manager (without it, items like "copy to VM/open in disposable VM" will not be shown in Nautilus/Thunar). +**Desktop environment** | To improve desktop experience using additional packages from the `qubes-core-agent` | `qubes-menus` which defines menu layout, `qubes-desktop-linux-common` which contains icons and scripts to improve desktop experience. `qubes-core-agent-nautilus`/`qubes-core-agent-thunar`: packages providing integration with the Nautilus/Thunar file manager (without it, items like "copy to VM/open in disposable VM" will not be shown in Nautilus/Thunar). Also, there are packages to provide additional services: - `qubes-gpg-split`: For implementing split GPG. @@ -87,7 +87,7 @@ Also, there are packages to provide additional services: - `qubes-pdf-converter`: For implementing safe conversion of PDFs. - `qubes-img-converter`: For implementing safe conversion of images. - `qubes-snapd-helper`: If you want to use snaps in qubes. -- `qubes-thunderbird`: Additional tools for use in thunderbird. +- `qubes-thunderbird`: Additional tools for use in Thunderbird. - `qubes-app-shutdown-idle`: If you want qubes to automatically shutdown when idle. - `qubes-mgmt-\*`: If you want to use salt management on the template and qubes. diff --git a/external/os-guides/centos/centos.md b/external/os-guides/centos/centos.md index 50dc65b6..03b23a72 100644 --- a/external/os-guides/centos/centos.md +++ b/external/os-guides/centos/centos.md @@ -26,4 +26,4 @@ After a fresh install, we recommend to [Update the TemplateVM](/doc/software-upd * [How can I contribute to the Qubes Project?](/doc/contributing/) -* [Guidelines for Documentation Contributors](/doc/doc-guidelines/) \ No newline at end of file +* [Guidelines for Documentation Contributors](/doc/doc-guidelines/) diff --git a/user/managing-os/fedora/fedora-xfce.md b/user/managing-os/fedora/fedora-xfce.md index c3af70d8..5fc72036 100644 --- a/user/managing-os/fedora/fedora-xfce.md +++ b/user/managing-os/fedora/fedora-xfce.md @@ -24,4 +24,4 @@ To reinstall a Fedora Xfce TemplateVM that is already installed in your system, Upgrading --------- -To upgrade your Fedora TemplateVM, please see [Upgrade Fedora TemplateVM](/doc/templates/fedora/#upgrading). \ No newline at end of file +To upgrade your Fedora TemplateVM, please see [Upgrade Fedora TemplateVM](/doc/templates/fedora/#upgrading). diff --git a/user/managing-os/fedora/fedora.md b/user/managing-os/fedora/fedora.md index b68a4983..7086d230 100644 --- a/user/managing-os/fedora/fedora.md +++ b/user/managing-os/fedora/fedora.md @@ -9,7 +9,7 @@ The Fedora TemplateVM The Fedora [TemplateVM] is the default TemplateVM in Qubes OS. This page is about the standard (or "full") Fedora TemplateVM. -For the minimal and Xfce version, please see the [Fedora Minimal] and [Fedora Xfce] page. +For the minimal and Xfce versions, please see the [Fedora Minimal] and [Fedora Xfce] pages. Installing ---------- diff --git a/user/managing-os/templates.md b/user/managing-os/templates.md index 3bd3fb64..f7abb103 100644 --- a/user/managing-os/templates.md +++ b/user/managing-os/templates.md @@ -45,6 +45,7 @@ By installing these templates, you are trusting not only the Qubes developers an * [Ubuntu](/doc/templates/ubuntu/) * [Archlinux](/doc/templates/archlinux/) * [CentOS](/doc/templates/centos/) +* [CentOS Minimal](/doc/templates/centos-minimal/) ## How to install, uninstall, reinstall, and switch From 66b643be2eb2bb49a1d2c1c739aa8f993a572d4f Mon Sep 17 00:00:00 2001 From: nastaziya Date: Thu, 12 Sep 2019 05:54:50 -0400 Subject: [PATCH 2/4] include centos-minimal in minimal templates page --- external/os-guides/centos-minimal | 0 external/os-guides/{centos => }/centos.md | 7 +- external/os-guides/centos/centos-minimal.md | 98 --------------------- user/managing-os/minimal-templates.md | 30 ++++++- 4 files changed, 32 insertions(+), 103 deletions(-) delete mode 100644 external/os-guides/centos-minimal rename external/os-guides/{centos => }/centos.md (78%) delete mode 100644 external/os-guides/centos/centos-minimal.md diff --git a/external/os-guides/centos-minimal b/external/os-guides/centos-minimal deleted file mode 100644 index e69de29b..00000000 diff --git a/external/os-guides/centos/centos.md b/external/os-guides/centos.md similarity index 78% rename from external/os-guides/centos/centos.md rename to external/os-guides/centos.md index 03b23a72..67401f58 100644 --- a/external/os-guides/centos/centos.md +++ b/external/os-guides/centos.md @@ -8,13 +8,14 @@ permalink: /doc/templates/centos/ If you would like to use a stable, predictable, manageable and reproducible distribution in your AppVMs, you can install the CentOS template, provided by Qubes in ready to use binary package. -For the minimal version, please see [CentOS minimal](/doc/templates/centos-minimal/). +For the minimal version, please see [Minimal TemplateVMs](/doc/templates/minimal/) + ## Installation -Currently available from the testing repository, CentOS-7 can be installed with the following command: +CentOS-7 can be installed with the following command: - [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community-testing qubes-template-centos-7 + [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-centos-7 To switch, reinstall and uninstall a CentOS TemplateVM that is already installed in your system, see [How to switch, reinstall and uninstall](/doc/templates/#how-to-install-uninstall-reinstall-and-switch). diff --git a/external/os-guides/centos/centos-minimal.md b/external/os-guides/centos/centos-minimal.md deleted file mode 100644 index 67fe7faa..00000000 --- a/external/os-guides/centos/centos-minimal.md +++ /dev/null @@ -1,98 +0,0 @@ ---- -layout: doc -title: CentOS Minimal Template -permalink: /doc/templates/centos-minimal/ ---- - -# CentOS Minimal Template - -The minimal CentOS images use the standard CentOS installer with all of its regular features minus the selection of packages, thus keeping only the most essential ones, including the xterm terminal emulator. `yum` is completed and can be used to add or remove packages, right after the template installation. - -The CentOS Minimal template is intended only for advanced users and requires some familiarity with the command line and basics of Qubes. - -## Installation - -The CentOS-7 Minimal Template can be installed with the following command: - - [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community-testing qubes-template-centos-7-minimal - -To switch, reinstall and uninstall a CentOS TemplateVM that is already installed in your system, see [How to switch, reinstall and uninstall](/doc/templates/#how-to-install-uninstall-reinstall-and-switch). - -Customization ---------------------------- - -### Clone - -It is highly recommended not to make any changes in the original template, but use a **clone** instead. The following command clones the template. (Replace `your-new-clone` with your desired name.) - -~~~ -[user@dom0 ~]$ qvm-clone centos-7-minimal your-new-clone -~~~ - -You must start the template in order to customize it. - -**Customizing** the template for specific use cases normally requires installing additional packages. In the running template, use yum to install the required packages as follows (replace packages with a space-delimited list of `packages` to be installed): - -~~~ -[user@your-new-clone ~]$ sudo yum install packages -~~~ - -### Passwordless root - -Before starting to install packages in your template, it is worthy of mention that in Qubes, the minimal template is not configured for passwordless root. -To update or install packages to it, from a dom0 terminal window run: - -~~~ -[user@dom0 ~]$ qvm-run -u root centos-7-minimal xterm -~~~ - -to open a root terminal in the template, from which you can use yum without sudo. You will have to do this every time if you choose not to enable passwordless root. - -If you want the usual CentOS qubes `sudo yum ...` commands, open the root terminal just this once using the above command, and in the root xterm window enter - -~~~ -bash-4.4# yum install qubes-core-agent-passwordless-root polkit -~~~ - -Optionally check this worked: from the gui open the minimal template's xterm and give the command - -~~~ -[user@cent-min-clone ~]$ sudo -l -~~~ - -which should give you output that includes the `NOPASSWD` keyword. - -From this point, your template is ready to be customized. - -### Packages - -The following table provides an overview of which packages are needed for which purpose. - -Use case | Description | Required steps ---- | --- | --- -**Standard utilities** | If you need the commonly used utilities | Install the following packages: `pciutils` `vim-minimal` `less` `psmisc` `gnome-keyring` -**Networking** | If you want networking | Install qubes-core-agent-networking -**Audio** | If you want sound from your VM... | Install `pulseaudio-qubes` -**FirewallVM** | You can use the minimal template as a template for a [FirewallVM](/doc/firewall/), like `sys-firewall` | Install `qubes-core-agent-networking`, and `nftables`. Also install `qubes-core-agent-dom0-updates`(script required to handle `dom0` updates), if you want to use a qube based on the template as an updateVM (normally sys-firewall). -**NetVM** | You can use this template as the basis for a NetVM such as `sys-net` | Install the following packages: `qubes-core-agent-networking`, `qubes-core-agent-network-manager` and `nftables`. -**NetVM (extra firmware)** | If your network devices need extra packages for a network VM | Use the `lspci` command to identify the devices, then find the package that provides necessary firnware and install it. -**Network utilities** | If you need utilities for debugging and analyzing network connections | Install the following packages: `tcpdump` `telnet` `nmap` `nmap-ncat` -**USB** | If you want to use this template as the basis for a [USB](/doc/usb/) qube such as `sys-usb` | Install `qubes-usb-proxy`. To use USB mouse or keyboard install `qubes-input-proxy-sender`. -**VPN** | You can use this template as basis for a [VPN](/doc/vpn/) qube | You may need to install network-manager VPN packages, depending on the VPN technology you'll be using. After creating a machine based on this template, follow the [VPN howto](/doc/vpn/#set-up-a-proxyvm-as-a-vpn-gateway-using-networkmanager) to configure it. -**Desktop environment** | To improve desktop experience using additional packages from the `qubes-core-agent` | `qubes-menus` which defines menu layout, `qubes-desktop-linux-common` which contains icons and scripts to improve desktop experience. `qubes-core-agent-nautilus`/`qubes-core-agent-thunar`: packages providing integration with the Nautilus/Thunar file manager (without it, items like "copy to VM/open in disposable VM" will not be shown in Nautilus/Thunar). - -Also, there are packages to provide additional services: -- `qubes-gpg-split`: For implementing split GPG. -- `qubes-u2f`: For implementing secure forwarding of U2F messages. -- `qubes-pdf-converter`: For implementing safe conversion of PDFs. -- `qubes-img-converter`: For implementing safe conversion of images. -- `qubes-snapd-helper`: If you want to use snaps in qubes. -- `qubes-thunderbird`: Additional tools for use in Thunderbird. -- `qubes-app-shutdown-idle`: If you want qubes to automatically shutdown when idle. -- `qubes-mgmt-\*`: If you want to use salt management on the template and qubes. - -## Want to contribute? - -* [How can I contribute to the Qubes Project?](/doc/contributing/) - -* [Guidelines for Documentation Contributors](/doc/doc-guidelines/) diff --git a/user/managing-os/minimal-templates.md b/user/managing-os/minimal-templates.md index 5227d9cb..5b1f1d85 100644 --- a/user/managing-os/minimal-templates.md +++ b/user/managing-os/minimal-templates.md @@ -16,7 +16,7 @@ redirect_from: The Minimal [TemplateVMs] are lightweight versions of their standard TemplateVM counterparts. They have only the most vital packages installed, including a minimal X and xterm installation. The sections below contain instructions for using the template and provide some examples for common use cases. -There are currently two Minimal TemplateVMs corresponding to the standard [Fedora] and [Debian] TemplateVMs. +There are currently three Minimal TemplateVMs corresponding to the standard [Fedora], [Debian] and [CentOS] TemplateVMs. ## Important @@ -42,6 +42,10 @@ You may wish to try again with the testing repository enabled: [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-itl-testing qubes-template-X-minimal +If you would like to install a community distribution, try the install command by enabling the community repository: + + [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-X-minimal + The download may take a while depending on your connection speed. @@ -121,7 +125,7 @@ To access the `journald` log, use the `journalctl` command. ### Debian As you would expect, the required packages can be installed in the running template with any apt-based command. -For example : (Replace "packages` with a space-delimited list of packages to be installed.) +For example : (Replace `packages` with a space-delimited list of packages to be installed.) [user@your-new-clone ~]$ sudo apt install packages @@ -162,9 +166,31 @@ Documentation on all of these can be found in the [docs](/doc) You could, of course, use qubes-vm-recommended to automatically install many of these, but in that case you are well on the way to a standard Debian template. +### CentOS + +As is the case with above-mentioned Minimal Templates, the required packages are to be installed in the running template with the following command (replace `packages` with a space-delimited list of packages to be installed): + + [user@your-new-clone ~]$ sudo yum install packages + +Use case | Description | Required steps +--- | --- | --- +**Standard utilities** | If you need the commonly used utilities | Install the following packages: `pciutils` `vim-minimal` `less` `psmisc` `gnome-keyring` +**Networking** | If you want networking | Install `qubes-core-agent-networking` `qubes-core-agent-network-manager` `NetworkManager-wifi` `network-manager-applet` `wireless-tools` `dejavu-sans-fonts` `notification-daemon` `gnome-keyring` +**Audio** | If you want sound from your VM... | Install `pulseaudio-qubes` +**FirewallVM** | You can use the minimal template as a template for a [FirewallVM](/doc/firewall/), like `sys-firewall` | Install `qubes-core-agent-networking`, and `nftables`. Also install `qubes-core-agent-dom0-updates`(script required to handle `dom0` updates), if you want to use a qube based on the template as an updateVM (normally sys-firewall). +**NetVM** | You can use this template as the basis for a NetVM such as `sys-net` | Install the following packages: `qubes-core-agent-networking`, `qubes-core-agent-network-manager` and `nftables`. +**NetVM (extra firmware)** | If your network devices need extra packages for a network VM | Use the `lspci` command to identify the devices, then find the package that provides necessary firnware and install it. +**Network utilities** | If you need utilities for debugging and analyzing network connections | Install the following packages: `tcpdump` `telnet` `nmap` `nmap-ncat` +**USB** | If you want to use this template as the basis for a [USB](/doc/usb/) qube such as `sys-usb` | Install `qubes-usb-proxy`. To use USB mouse or keyboard install `qubes-input-proxy-sender`. +**VPN** | You can use this template as basis for a [VPN](/doc/vpn/) qube | You may need to install network-manager VPN packages, depending on the VPN technology you'll be using. After creating a machine based on this template, follow the [VPN howto](/doc/vpn/#set-up-a-proxyvm-as-a-vpn-gateway-using-networkmanager) to configure it. +**Desktop environment** | To improve desktop experience using additional packages from the `qubes-core-agent` | `qubes-menus` which defines menu layout, `qubes-desktop-linux-common` which contains icons and scripts to improve desktop experience. `qubes-core-agent-nautilus`/`qubes-core-agent-thunar`: packages providing integration with the Nautilus/Thunar file manager (without it, items like "copy to VM/open in disposable VM" will not be shown in Nautilus/Thunar). +**Additional services** | If you need additional Qubes services | Install `qubes-gpg-split` `qubes-pdf-converter` `qubes-img-converter`("Qubes apps" implementing split GPG, trusted PDF and image convertion), `qubes-snapd-helper`(if you want to use snaps), `qubes-mgmt-\*`(if you want to use salt management on the template and qubes). + + [TemplateVMs]: /doc/templates/ [Fedora]: /doc/templates/fedora/ [Debian]: /doc/templates/debian/ +[CentOS]: /doc/templates/centos/ [qubes-users]: /support/#qubes-users [doc-guidelines]: /doc/doc-guidelines/ [pref-default]: /faq/#could-you-please-make-my-preference-the-default From 7ac443b528ae13284a7a136dbee8bc1234be8801 Mon Sep 17 00:00:00 2001 From: Anastasia Cotorobai Date: Thu, 12 Sep 2019 10:00:27 -0400 Subject: [PATCH 3/4] Update centos.md --- external/os-guides/centos.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/external/os-guides/centos.md b/external/os-guides/centos.md index 67401f58..3f4ab8e9 100644 --- a/external/os-guides/centos.md +++ b/external/os-guides/centos.md @@ -17,7 +17,7 @@ CentOS-7 can be installed with the following command: [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-centos-7 -To switch, reinstall and uninstall a CentOS TemplateVM that is already installed in your system, see [How to switch, reinstall and uninstall](/doc/templates/#how-to-install-uninstall-reinstall-and-switch). +To switch, reinstall and uninstall a CentOS TemplateVM that is already installed in your system, see *How to [switch], [reinstall] and [uninstall]*. #### After Installing @@ -28,3 +28,9 @@ After a fresh install, we recommend to [Update the TemplateVM](/doc/software-upd * [How can I contribute to the Qubes Project?](/doc/contributing/) * [Guidelines for Documentation Contributors](/doc/doc-guidelines/) + +[switch]: /doc/templates/#switching +[reinstall]: /doc/reinstall-template/ +[uninstall]: /doc/templates/#uninstalling + + From 0356083d8e2efba7940c293f832ca7de20b375ef Mon Sep 17 00:00:00 2001 From: Anastasia Cotorobai Date: Thu, 12 Sep 2019 10:00:27 -0400 Subject: [PATCH 4/4] Update centos.md --- external/os-guides/centos.md | 8 +++++++- user/managing-os/minimal-templates.md | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/external/os-guides/centos.md b/external/os-guides/centos.md index 67401f58..3f4ab8e9 100644 --- a/external/os-guides/centos.md +++ b/external/os-guides/centos.md @@ -17,7 +17,7 @@ CentOS-7 can be installed with the following command: [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-centos-7 -To switch, reinstall and uninstall a CentOS TemplateVM that is already installed in your system, see [How to switch, reinstall and uninstall](/doc/templates/#how-to-install-uninstall-reinstall-and-switch). +To switch, reinstall and uninstall a CentOS TemplateVM that is already installed in your system, see *How to [switch], [reinstall] and [uninstall]*. #### After Installing @@ -28,3 +28,9 @@ After a fresh install, we recommend to [Update the TemplateVM](/doc/software-upd * [How can I contribute to the Qubes Project?](/doc/contributing/) * [Guidelines for Documentation Contributors](/doc/doc-guidelines/) + +[switch]: /doc/templates/#switching +[reinstall]: /doc/reinstall-template/ +[uninstall]: /doc/templates/#uninstalling + + diff --git a/user/managing-os/minimal-templates.md b/user/managing-os/minimal-templates.md index 5b1f1d85..349cc069 100644 --- a/user/managing-os/minimal-templates.md +++ b/user/managing-os/minimal-templates.md @@ -184,7 +184,7 @@ Use case | Description | Required steps **USB** | If you want to use this template as the basis for a [USB](/doc/usb/) qube such as `sys-usb` | Install `qubes-usb-proxy`. To use USB mouse or keyboard install `qubes-input-proxy-sender`. **VPN** | You can use this template as basis for a [VPN](/doc/vpn/) qube | You may need to install network-manager VPN packages, depending on the VPN technology you'll be using. After creating a machine based on this template, follow the [VPN howto](/doc/vpn/#set-up-a-proxyvm-as-a-vpn-gateway-using-networkmanager) to configure it. **Desktop environment** | To improve desktop experience using additional packages from the `qubes-core-agent` | `qubes-menus` which defines menu layout, `qubes-desktop-linux-common` which contains icons and scripts to improve desktop experience. `qubes-core-agent-nautilus`/`qubes-core-agent-thunar`: packages providing integration with the Nautilus/Thunar file manager (without it, items like "copy to VM/open in disposable VM" will not be shown in Nautilus/Thunar). -**Additional services** | If you need additional Qubes services | Install `qubes-gpg-split` `qubes-pdf-converter` `qubes-img-converter`("Qubes apps" implementing split GPG, trusted PDF and image convertion), `qubes-snapd-helper`(if you want to use snaps), `qubes-mgmt-\*`(if you want to use salt management on the template and qubes). +**Additional services** | If you need additional Qubes services | Install `qubes-gpg-split` `qubes-pdf-converter` `qubes-img-converter`("Qubes apps" implementing split GPG, trusted PDF and image converter), `qubes-snapd-helper`(if you want to use snaps), `qubes-mgmt-\*`(if you want to use salt management on the template and qubes). [TemplateVMs]: /doc/templates/