diff --git a/FORMULA.dom0 b/FORMULA.dom0 index e748fe8..6dd1952 100644 --- a/FORMULA.dom0 +++ b/FORMULA.dom0 @@ -1,7 +1,7 @@ # vim: set syntax=yaml ts=2 sw=2 sts=2 et : package-name: qubes-mgmt-salt-dom0-virtual-machines -saltenv: dom0 +saltenv: base version: 3.1.1 release: 1 name: virtual-machines-formula diff --git a/README.rst b/README.rst index 68afb56..6366401 100644 --- a/README.rst +++ b/README.rst @@ -7,7 +7,7 @@ configuring virtual-machine AppVM's. Uses pillar data to define default VM names and configuration details. Default settings can be overridden in pillar data located at: - ``/srv/pillar/dom0/qvm/init.sls`` + ``/srv/pillar/base/qvm/init.sls`` Available states ================ diff --git a/pillar/qvm/init.top b/pillar/qvm/init.top index 845d2f6..cf23000 100644 --- a/pillar/qvm/init.top +++ b/pillar/qvm/init.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm diff --git a/qvm/anon-whonix.top b/qvm/anon-whonix.top index ce0187a..5fb7be5 100644 --- a/qvm/anon-whonix.top +++ b/qvm/anon-whonix.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm.anon-whonix diff --git a/qvm/personal.top b/qvm/personal.top index 8f54bee..e53412a 100644 --- a/qvm/personal.top +++ b/qvm/personal.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm.personal diff --git a/qvm/sys-firewall.top b/qvm/sys-firewall.top index fda6c4d..982e64a 100644 --- a/qvm/sys-firewall.top +++ b/qvm/sys-firewall.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm.sys-firewall diff --git a/qvm/sys-net-with-usb.top b/qvm/sys-net-with-usb.top index f20b7a4..5a4b16d 100644 --- a/qvm/sys-net-with-usb.top +++ b/qvm/sys-net-with-usb.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm.sys-net-with-usb diff --git a/qvm/sys-net.top b/qvm/sys-net.top index 904ee23..845f978 100644 --- a/qvm/sys-net.top +++ b/qvm/sys-net.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm.sys-net diff --git a/qvm/sys-usb.top b/qvm/sys-usb.top index 473a36a..89a6125 100644 --- a/qvm/sys-usb.top +++ b/qvm/sys-usb.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm.sys-usb diff --git a/qvm/sys-whonix.top b/qvm/sys-whonix.top index fc3630a..9543ad2 100644 --- a/qvm/sys-whonix.top +++ b/qvm/sys-whonix.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm.sys-whonix diff --git a/qvm/untrusted.top b/qvm/untrusted.top index 1e3caaf..e55bf9d 100644 --- a/qvm/untrusted.top +++ b/qvm/untrusted.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm.untrusted diff --git a/qvm/vault.top b/qvm/vault.top index ce80f04..8c0963c 100644 --- a/qvm/vault.top +++ b/qvm/vault.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm.vault diff --git a/qvm/work.top b/qvm/work.top index e1d22c2..6e7dd15 100644 --- a/qvm/work.top +++ b/qvm/work.top @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: set syntax=yaml ts=2 sw=2 sts=2 et : -dom0: +base: dom0: - match: nodegroup - qvm.work diff --git a/rpm_spec/qubes-mgmt-salt-dom0-virtual-machines-dom0.spec b/rpm_spec/qubes-mgmt-salt-dom0-virtual-machines-dom0.spec index 1f5216b..d1208cd 100644 --- a/rpm_spec/qubes-mgmt-salt-dom0-virtual-machines-dom0.spec +++ b/rpm_spec/qubes-mgmt-salt-dom0-virtual-machines-dom0.spec @@ -37,54 +37,66 @@ qubesctl saltutil.clear_cache -l quiet --out quiet > /dev/null || true qubesctl saltutil.sync_all refresh=true -l quiet --out quiet > /dev/null || true # Enable States -#qubesctl top.enable qvm.sys-net saltenv=dom0 -l quiet --out quiet > /dev/null || true -#qubesctl top.enable qvm.sys-firewall saltenv=dom0 -l quiet --out quiet > /dev/null || true -#qubesctl top.enable qvm.sys-whonix saltenv=dom0 -l quiet --out quiet > /dev/null || true -#qubesctl top.enable qvm.anon-whonix saltenv=dom0 -l quiet --out quiet > /dev/null || true -#qubesctl top.enable qvm.personal saltenv=dom0 -l quiet --out quiet > /dev/null || true -#qubesctl top.enable qvm.work saltenv=dom0 -l quiet --out quiet > /dev/null || true -#qubesctl top.enable qvm.untrusted saltenv=dom0 -l quiet --out quiet > /dev/null || true -#qubesctl top.enable qvm.vault saltenv=dom0 -l quiet --out quiet > /dev/null || true +#qubesctl top.enable qvm.sys-net -l quiet --out quiet > /dev/null || true +#qubesctl top.enable qvm.sys-firewall -l quiet --out quiet > /dev/null || true +#qubesctl top.enable qvm.sys-whonix -l quiet --out quiet > /dev/null || true +#qubesctl top.enable qvm.anon-whonix -l quiet --out quiet > /dev/null || true +#qubesctl top.enable qvm.personal -l quiet --out quiet > /dev/null || true +#qubesctl top.enable qvm.work -l quiet --out quiet > /dev/null || true +#qubesctl top.enable qvm.untrusted -l quiet --out quiet > /dev/null || true +#qubesctl top.enable qvm.vault -l quiet --out quiet > /dev/null || true # Enable Pillar States -qubesctl top.enable qvm saltenv=dom0 pillar=true -l quiet --out quiet > /dev/null || true +qubesctl top.enable qvm pillar=true -l quiet --out quiet > /dev/null || true + +# Migrate enabled tops from dom0 to base environment +for top in sys-net sys-firewall sys-whonix anon-whonix personal work untrusted vault sys-net-with-usb; do + if [ -r /srv/salt/_tops/dom0/qvm.$top.top ]; then + rm -f /srv/salt/_tops/dom0/qvm.$top.top + qubesctl top.enable qvm.$top -l quiet --out quiet > /dev/null || true + fi +done + +if [ -r /srv/pillar/_tops/dom0/qvm.top ]; then + rm -f /srv/pillar/_tops/dom0/qvm.top +fi %files %defattr(-,root,root) %doc LICENSE README.rst -%attr(750, root, root) %dir /srv/formulas/dom0/virtual-machines-formula -/srv/formulas/dom0/virtual-machines-formula/README.rst -/srv/formulas/dom0/virtual-machines-formula/LICENSE -/srv/formulas/dom0/virtual-machines-formula/qvm/anon-whonix.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/anon-whonix.top -/srv/formulas/dom0/virtual-machines-formula/qvm/personal.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/personal.top -/srv/formulas/dom0/virtual-machines-formula/qvm/sys-firewall.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/sys-firewall.top -/srv/formulas/dom0/virtual-machines-formula/qvm/sys-net.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/sys-net.top -/srv/formulas/dom0/virtual-machines-formula/qvm/sys-net-with-usb.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/sys-net-with-usb.top -/srv/formulas/dom0/virtual-machines-formula/qvm/sys-usb.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/sys-usb.top -/srv/formulas/dom0/virtual-machines-formula/qvm/sys-whonix.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/sys-whonix.top -/srv/formulas/dom0/virtual-machines-formula/qvm/template-debian-7.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/template-debian-8.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/template-fedora-21-minimal.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/template-fedora-21.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/template.jinja -/srv/formulas/dom0/virtual-machines-formula/qvm/template-whonix-gw.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/template-whonix-ws.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/untrusted.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/untrusted.top -/srv/formulas/dom0/virtual-machines-formula/qvm/vault.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/vault.top -/srv/formulas/dom0/virtual-machines-formula/qvm/work.sls -/srv/formulas/dom0/virtual-machines-formula/qvm/work.top +%attr(750, root, root) %dir /srv/formulas/base/virtual-machines-formula +/srv/formulas/base/virtual-machines-formula/README.rst +/srv/formulas/base/virtual-machines-formula/LICENSE +/srv/formulas/base/virtual-machines-formula/qvm/anon-whonix.sls +/srv/formulas/base/virtual-machines-formula/qvm/anon-whonix.top +/srv/formulas/base/virtual-machines-formula/qvm/personal.sls +/srv/formulas/base/virtual-machines-formula/qvm/personal.top +/srv/formulas/base/virtual-machines-formula/qvm/sys-firewall.sls +/srv/formulas/base/virtual-machines-formula/qvm/sys-firewall.top +/srv/formulas/base/virtual-machines-formula/qvm/sys-net.sls +/srv/formulas/base/virtual-machines-formula/qvm/sys-net.top +/srv/formulas/base/virtual-machines-formula/qvm/sys-net-with-usb.sls +/srv/formulas/base/virtual-machines-formula/qvm/sys-net-with-usb.top +/srv/formulas/base/virtual-machines-formula/qvm/sys-usb.sls +/srv/formulas/base/virtual-machines-formula/qvm/sys-usb.top +/srv/formulas/base/virtual-machines-formula/qvm/sys-whonix.sls +/srv/formulas/base/virtual-machines-formula/qvm/sys-whonix.top +/srv/formulas/base/virtual-machines-formula/qvm/template-debian-7.sls +/srv/formulas/base/virtual-machines-formula/qvm/template-debian-8.sls +/srv/formulas/base/virtual-machines-formula/qvm/template-fedora-21-minimal.sls +/srv/formulas/base/virtual-machines-formula/qvm/template-fedora-21.sls +/srv/formulas/base/virtual-machines-formula/qvm/template.jinja +/srv/formulas/base/virtual-machines-formula/qvm/template-whonix-gw.sls +/srv/formulas/base/virtual-machines-formula/qvm/template-whonix-ws.sls +/srv/formulas/base/virtual-machines-formula/qvm/untrusted.sls +/srv/formulas/base/virtual-machines-formula/qvm/untrusted.top +/srv/formulas/base/virtual-machines-formula/qvm/vault.sls +/srv/formulas/base/virtual-machines-formula/qvm/vault.top +/srv/formulas/base/virtual-machines-formula/qvm/work.sls +/srv/formulas/base/virtual-machines-formula/qvm/work.top -%attr(750, root, root) %dir /srv/pillar/dom0/qvm -%config(noreplace) /srv/pillar/dom0/qvm/init.sls -/srv/pillar/dom0/qvm/init.top +%attr(750, root, root) %dir /srv/pillar/base/qvm +%config(noreplace) /srv/pillar/base/qvm/init.sls +/srv/pillar/base/qvm/init.top %changelog