First naive approach to updating to whonix 14

viq · May 3, 2018 · 857ee77 · 857ee77
1 parent d237ac1
commit 857ee77
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/qvm/anon-whonix.sls b/qvm/anon-whonix.sls
@@ -26,7 +26,7 @@ include:
 {% load_yaml as defaults -%}
 name:          anon-whonix
 present:
-  - template:  whonix-ws
+  - template:  whonix-ws-14
   - label:     red
 prefs:
   - netvm:     sys-whonix
@@ -35,7 +35,7 @@ tags:
   - add:
     - anon-vm
 require:
-  - pkg:       template-whonix-ws
+  - pkg:       template-whonix-ws-14
   - qvm:       sys-whonix
   - qvm:       whonix-ws-dvm
 {%- endload %}

diff --git a/qvm/sys-whonix.sls b/qvm/sys-whonix.sls
@@ -25,15 +25,15 @@ include:
 {% load_yaml as defaults -%}
 name:          sys-whonix
 present:
-  - template:  whonix-gw
+  - template:  whonix-gw-14
   - label:     black
   - mem:       500
 prefs:
   - netvm:     sys-firewall
   - provides-network: true
   - autostart: true
 require:
-  - pkg:       template-whonix-gw
+  - pkg:       template-whonix-gw-14
   - qvm:       sys-firewall
 {%- endload %}
 

diff --git a/qvm/template-whonix-gw.sls b/qvm/template-whonix-gw.sls
@@ -11,20 +11,20 @@
 #   qubesctl state.sls qvm.template-whonix-gw dom0
 ##
 
-template-whonix-gw:
+template-whonix-gw-14:
   pkg.installed:
-    - name:     qubes-template-whonix-gw
+    - name:     qubes-template-whonix-gw-14
     - fromrepo: qubes-templates-community
 
 whonix-gw-tag:
   qvm.vm:
-    - name: whonix-gw
+    - name: whonix-gw-14
     - tags:
       - present:
         - whonix-updatevm
     - features:
       - enable:
-        - whonix-gw
+        - whonix-gw-14
 
 whonix-gw-update-policy:
   file.prepend:

diff --git a/qvm/template-whonix-ws.sls b/qvm/template-whonix-ws.sls
@@ -11,20 +11,20 @@
 #   qubesctl state.sls qvm.template-whonix-ws dom0
 ##
 
-template-whonix-ws:
+template-whonix-ws-14:
   pkg.installed:
-    - name:     qubes-template-whonix-ws
+    - name:     qubes-template-whonix-ws-14
     - fromrepo: qubes-templates-community
 
 whonix-ws-tag:
   qvm.vm:
-    - name: whonix-ws
+    - name: whonix-ws-14
     - tags:
       - present:
         - whonix-updatevm
     - features:
       - enable:
-        - whonix-ws
+        - whonix-ws-14
 
 whonix-ws-update-policy:
   file.prepend:

diff --git a/qvm/whonix-ws-dvm.sls b/qvm/whonix-ws-dvm.sls
@@ -27,7 +27,7 @@ include:
 {% load_yaml as defaults -%}
 name:          whonix-ws-dvm
 present:
-  - template:  whonix-ws
+  - template:  whonix-ws-14
   - label:     red
 prefs:
   - netvm:     sys-whonix
@@ -40,7 +40,7 @@ features:
   - enable:
     - appmenus-dispvm
 require:
-  - pkg:       template-whonix-ws
+  - pkg:       template-whonix-ws-14
   - qvm:       sys-whonix
 {%- endload %}