ADDED: mullvad-browser-alpha for testing purposes

diff --git a/user_salt/mullvad-browser/init.sls b/user_salt/mullvad-browser/init.sls
index 19073484845186e13ca9d2a95c029e714e7755c3..eaa65ded0189d06a23455bce2168996715a99f37 100644 (file)
--- a/user_salt/mullvad-browser/init.sls
+++ b/user_salt/mullvad-browser/init.sls
@@ -2,4 +2,4 @@ include:
   - mullvad-browser.mullvad-browser--create-template
   - mullvad-browser.mullvad-browser--configure-repos
   - mullvad-browser.mullvad-browser--install-packages
-  - mullvad-browser.mullvad-browser--create-app-qube
+  - mullvad-browser.mullvad-browser--create-qube

diff --git a/user_salt/mullvad-browser/mullvad-browser--create-app-qube.sls b/user_salt/mullvad-browser/mullvad-browser--create-app-qube.sls
deleted file mode 100644 (file)
index 3dc08c3..0000000
--- a/user_salt/mullvad-browser/mullvad-browser--create-app-qube.sls
+++ /dev/null
@@ -1,21 +0,0 @@
-{% if grains['id'] == 'dom0' %}
-
-mullvad-browser--create-app-qube:
-  qvm.vm:
-    - name: q-mullvad-browser
-    - present:
-      - template: template-mullvad-browser
-      - label: red
-    - prefs:
-      - label: red
-      - audiovm: sys-audio
-      - guivm: dom0
-      - netvm: sys-vpn-mullvad
-      - template_for_dispvms: True
-    - features:
-      - set:
-        - menu-items: mullvad-browser.desktop debian-xterm.desktop
-    - require:
-      - qvm: mullvad-browser--create-template
-
-{% endif %}

diff --git a/user_salt/mullvad-browser/mullvad-browser--create-qube.sls b/user_salt/mullvad-browser/mullvad-browser--create-qube.sls
new file mode 100644 (file)
index 0000000..61f2aa9
--- /dev/null
+++ b/user_salt/mullvad-browser/mullvad-browser--create-qube.sls
@@ -0,0 +1,21 @@
+{% if grains['id'] == 'dom0' %}
+
+mullvad-browser--create-qube:
+  qvm.vm:
+    - name: q-mullvad-browser
+    - present:
+      - template: template-mullvad-browser
+      - label: red
+    - prefs:
+      - label: red
+      - audiovm: sys-audio
+      - guivm: dom0
+      - netvm: sys-vpn-mullvad
+      - template_for_dispvms: True
+    - features:
+      - set:
+        - menu-items: mullvad-browser-alpha.desktop mullvad-browser.desktop debian-xterm.desktop
+    - require:
+      - qvm: mullvad-browser--create-template
+
+{% endif %}

diff --git a/user_salt/mullvad-browser/mullvad-browser--install-packages.sls b/user_salt/mullvad-browser/mullvad-browser--install-packages.sls
index 21b59667f5c0fcbd06e4112776364777ea9f8b63..d6a1969452e55971fb4438ea7f8c512cc0c27e90 100644 (file)
--- a/user_salt/mullvad-browser/mullvad-browser--install-packages.sls
+++ b/user_salt/mullvad-browser/mullvad-browser--install-packages.sls
@@ -6,6 +6,7 @@ mullvad-browser--install-packages:
     - pkgs:
       - qubes-core-agent-networking
       - mullvad-browser
+      - mullvad-browser-alpha
       - pulseaudio-qubes
     - require:
       - file: mullvad-browser--configure-repos