FIXED: wrong location of element states

diff --git a/element/element--configure-package-manager.sls b/element/element--configure-package-manager.sls
deleted file mode 100644 (file)
index 73900f9..0000000
--- a/element/element--configure-package-manager.sls
+++ /dev/null
@@ -1,20 +0,0 @@
-{% if grains['id'] == 'template-element' %}
-
-element--gpg-key:
-  file.managed:
-    - name: /usr/share/keyrings/element-io-archive-keyring.gpg
-    - source: salt://element/files/element-io-archive-keyring.gpg
-    - user: root
-    - group: root
-    - mode: 644
-
-element--apt-repo:
-  pkgrepo.managed:
-    - name: deb [arch=amd64 signed-by=/usr/share/keyrings/element-io-archive-keyring.gpg] https://packages.element.io/debian default main
-    - humanname: Element Repository
-    - file: /etc/apt/sources.list.d/element-io.list
-    - refresh: True
-    - require:
-      - file: element--gpg-key
-
-{% endif %}

diff --git a/element/element--create-qube.sls b/element/element--create-qube.sls
deleted file mode 100644 (file)
index 6ab44a1..0000000
--- a/element/element--create-qube.sls
+++ /dev/null
@@ -1,20 +0,0 @@
-{% if grains['id'] == 'dom0' %}
-
-element--create-qube:
-  qvm.vm:
-    - name: q-element
-    - present:
-      - template: template-element
-      - label: yellow
-    - prefs:
-      - label: yellow
-      - audiovm: sys-audio
-      - guivm: dom0
-      - netvm: sys-vpn-mullvad
-    - features:
-      - set:
-        - menu-items: element-desktop.desktop
-    - require:
-      - qvm: element--create-template
-
-{% endif %}

diff --git a/element/element--create-template.sls b/element/element--create-template.sls
deleted file mode 100644 (file)
index 470fb70..0000000
--- a/element/element--create-template.sls
+++ /dev/null
@@ -1,26 +0,0 @@
-{% import "templates/versions.jinja" as version %}
-
-include:
-  - templates.templates--install-debian-minimal
-
-{% if grains['id'] == 'dom0' %}
-
-element--create-template:
-  qvm.clone:
-    - name: template-element
-    - source: debian-{{ version.debian }}-minimal
-    - class: TemplateVM
-    - require:
-      - qvm: templates--install-debian-{{ version.debian }}-minimal
-
-element--create-template-prefs:
-  qvm.prefs:
-    - name: template-element
-    - label: yellow
-    - audiovm:
-    - guivm:
-    - netvm:
-    - require:
-      - qvm: element--create-template
-
-{% endif %}

diff --git a/element/element--install-packages.sls b/element/element--install-packages.sls
deleted file mode 100644 (file)
index a860f22..0000000
--- a/element/element--install-packages.sls
+++ /dev/null
@@ -1,13 +0,0 @@
-{% if grains['id'] == 'template-element' %}
-
-element--install-packages:
-  pkg.installed:
-    - refresh: True
-    - pkgs:
-      - qubes-core-agent-networking
-      - qubes-app-shutdown-idle
-      - element-desktop
-    - require:
-      - pkgrepo: element--apt-repo
-
-{% endif %}

diff --git a/element/files/element-io-archive-keyring.gpg b/element/files/element-io-archive-keyring.gpg
deleted file mode 100644 (file)
index 3a61810..0000000
Binary files a/element/files/element-io-archive-keyring.gpg and /dev/null differ

diff --git a/element/init.sls b/element/init.sls
deleted file mode 100644 (file)
index 6792d3c..0000000
--- a/element/init.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-include:
-  - element.element--create-template
-  - element.element--configure-package-manager
-  - element.element--install-packages
-  - element.element--create-qube

diff --git a/user_salt/element/element--configure-package-manager.sls b/user_salt/element/element--configure-package-manager.sls
new file mode 100644 (file)
index 0000000..73900f9
--- /dev/null
+++ b/user_salt/element/element--configure-package-manager.sls
@@ -0,0 +1,20 @@
+{% if grains['id'] == 'template-element' %}
+
+element--gpg-key:
+  file.managed:
+    - name: /usr/share/keyrings/element-io-archive-keyring.gpg
+    - source: salt://element/files/element-io-archive-keyring.gpg
+    - user: root
+    - group: root
+    - mode: 644
+
+element--apt-repo:
+  pkgrepo.managed:
+    - name: deb [arch=amd64 signed-by=/usr/share/keyrings/element-io-archive-keyring.gpg] https://packages.element.io/debian default main
+    - humanname: Element Repository
+    - file: /etc/apt/sources.list.d/element-io.list
+    - refresh: True
+    - require:
+      - file: element--gpg-key
+
+{% endif %}

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

diff --git a/user_salt/element/element--create-template.sls b/user_salt/element/element--create-template.sls
new file mode 100644 (file)
index 0000000..470fb70
--- /dev/null
+++ b/user_salt/element/element--create-template.sls
@@ -0,0 +1,26 @@
+{% import "templates/versions.jinja" as version %}
+
+include:
+  - templates.templates--install-debian-minimal
+
+{% if grains['id'] == 'dom0' %}
+
+element--create-template:
+  qvm.clone:
+    - name: template-element
+    - source: debian-{{ version.debian }}-minimal
+    - class: TemplateVM
+    - require:
+      - qvm: templates--install-debian-{{ version.debian }}-minimal
+
+element--create-template-prefs:
+  qvm.prefs:
+    - name: template-element
+    - label: yellow
+    - audiovm:
+    - guivm:
+    - netvm:
+    - require:
+      - qvm: element--create-template
+
+{% endif %}

diff --git a/user_salt/element/element--install-packages.sls b/user_salt/element/element--install-packages.sls
new file mode 100644 (file)
index 0000000..a860f22
--- /dev/null
+++ b/user_salt/element/element--install-packages.sls
@@ -0,0 +1,13 @@
+{% if grains['id'] == 'template-element' %}
+
+element--install-packages:
+  pkg.installed:
+    - refresh: True
+    - pkgs:
+      - qubes-core-agent-networking
+      - qubes-app-shutdown-idle
+      - element-desktop
+    - require:
+      - pkgrepo: element--apt-repo
+
+{% endif %}

diff --git a/user_salt/element/files/element-io-archive-keyring.gpg b/user_salt/element/files/element-io-archive-keyring.gpg
new file mode 100644 (file)
index 0000000..3a61810
Binary files /dev/null and b/user_salt/element/files/element-io-archive-keyring.gpg differ

diff --git a/user_salt/element/init.sls b/user_salt/element/init.sls
new file mode 100644 (file)
index 0000000..6792d3c
--- /dev/null
+++ b/user_salt/element/init.sls
@@ -0,0 +1,5 @@
+include:
+  - element.element--create-template
+  - element.element--configure-package-manager
+  - element.element--install-packages
+  - element.element--create-qube