From 354c2517016fd5b71e59b5675ce0a3f60ce265fd Mon Sep 17 00:00:00 2001
From: 100111001 <43482858+100111001@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:56:47 +0200
Subject: [PATCH] Changed hard coded templates to default templates from qubes

Also replaced wget by curl to make it compatible additionally for the default template of debian. (wget is not installed by default)
---
 SaltScriptToDownloadAndInstallMirageFirewallInQubes.sls | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SaltScriptToDownloadAndInstallMirageFirewallInQubes.sls b/SaltScriptToDownloadAndInstallMirageFirewallInQubes.sls
index ec3a486..1055faa 100644
--- a/SaltScriptToDownloadAndInstallMirageFirewallInQubes.sls
+++ b/SaltScriptToDownloadAndInstallMirageFirewallInQubes.sls
@@ -3,9 +3,9 @@
 # After the install, you have to switch your AppVMs to use the mirage firewall vm created by this script e.g. by using "Qubes Global Settings"
 # inspired by: https://github.com/one7two99/my-qubes/tree/master/mirage-firewall
 
-# You might want to adjust the following 2 variables to use up-to-date templates on your qubes
-{% set DownloadVMTemplate = "fedora-38" %}
-{% set DispVM = "fedora-38-dvm" %}
+# default template + dispvm template are used. Possible optimization is to use min-dvms
+{% set DownloadVMTemplate = salt['cmd.shell']("qubes-prefs default_template") %}
+{% set DispVM = salt['cmd.shell']("qubes-prefs default_dispvm") %}
 
 {% set DownloadVM = "DownloadVmMirage" %}
 {% set MirageFW = "sys-mirage-fw" %}
@@ -33,7 +33,7 @@ create-downloader-VM:
 download-and-unpack-in-DownloadVM4mirage:
   cmd.run: 
     - names:
-      - qvm-run --pass-io {{ DownloadVM }} {{ "wget " ~ DownloadBinary }}
+      - qvm-run --pass-io {{ DownloadVM }} {{ "curl -L -O " ~ DownloadBinary }}
       - qvm-run --pass-io {{ DownloadVM }} {{ "tar -xvjf " ~ Filename }}
     - require: 
       - create-downloader-VM