giving up on saltenv usage

kiemlicz · Jan 25, 2024 · f37f512 · f37f512
1 parent e184990
commit f37f512
Show file tree

Hide file tree

Showing 291 changed files with 0 additions and 13 deletions.
diff --git a/.github/ambassador-test.conf b/.github/ambassador-test.conf
@@ -19,8 +19,6 @@ fileserver_backend:
 env_order:
   - empty
   - base
-  - dev
-  - server
 
 # mine for test purposes
 mine_functions:

diff --git a/config/ambassador-installer.conf b/config/ambassador-installer.conf
@@ -20,16 +20,5 @@ ext_pillar: []
 grains:
     shell: "/bin/bash"
 
-file_roots:
-  base:
-    - /srv/salt/base
-  dev:
-    - /srv/salt/dev
-    - /srv/salt/base
-  server:
-    - /srv/salt/server
-    - /srv/salt/dev
-    - /srv/salt/base
-
 #log_level: debug
 #log_level_logfile: debug
diff --git a/salt/base/_common/README.md → salt/_common/README.md b/salt/base/_common/README.md → salt/_common/README.md
diff --git a/salt/base/_common/conf.jinja → salt/_common/conf.jinja b/salt/base/_common/conf.jinja → salt/_common/conf.jinja
diff --git a/salt/base/_common/debug.jinja → salt/_common/debug.jinja b/salt/base/_common/debug.jinja → salt/_common/debug.jinja
diff --git a/salt/base/_common/ip.jinja → salt/_common/ip.jinja b/salt/base/_common/ip.jinja → salt/_common/ip.jinja
diff --git a/salt/base/_common/repo.jinja → salt/_common/repo.jinja b/salt/base/_common/repo.jinja → salt/_common/repo.jinja
diff --git a/salt/base/_common/util.jinja → salt/_common/util.jinja b/salt/base/_common/util.jinja → salt/_common/util.jinja
diff --git a/salt/base/_engines/k8s_events.py → salt/_engines/k8s_events.py b/salt/base/_engines/k8s_events.py → salt/_engines/k8s_events.py
diff --git a/salt/dev/_macros/dev_tool.macros.jinja → salt/_macros/dev_tool.macros.jinja b/salt/dev/_macros/dev_tool.macros.jinja → salt/_macros/dev_tool.macros.jinja
diff --git a/salt/base/_modules/condition.py → salt/_modules/condition.py b/salt/base/_modules/condition.py → salt/_modules/condition.py
diff --git a/salt/base/_modules/dns_ext.py → salt/_modules/dns_ext.py b/salt/base/_modules/dns_ext.py → salt/_modules/dns_ext.py
diff --git a/salt/base/_modules/filters.py → salt/_modules/filters.py b/salt/base/_modules/filters.py → salt/_modules/filters.py
diff --git a/salt/base/_modules/kubeadm.py → salt/_modules/kubeadm.py b/salt/base/_modules/kubeadm.py → salt/_modules/kubeadm.py
diff --git a/salt/base/_modules/kubernetes.py → salt/_modules/kubernetes.py b/salt/base/_modules/kubernetes.py → salt/_modules/kubernetes.py
diff --git a/salt/base/_modules/lxc.py → salt/_modules/lxc.py b/salt/base/_modules/lxc.py → salt/_modules/lxc.py
diff --git a/salt/base/_modules/populate.py → salt/_modules/populate.py b/salt/base/_modules/populate.py → salt/_modules/populate.py
diff --git a/salt/base/_modules/slots_ext.py → salt/_modules/slots_ext.py b/salt/base/_modules/slots_ext.py → salt/_modules/slots_ext.py
diff --git a/salt/base/_pillar/privgit.py → salt/_pillar/privgit.py b/salt/base/_pillar/privgit.py → salt/_pillar/privgit.py
diff --git a/salt/base/_renderers/stringpy.py → salt/_renderers/stringpy.py b/salt/base/_renderers/stringpy.py → salt/_renderers/stringpy.py
diff --git a/salt/base/_runners/event_ext.py → salt/_runners/event_ext.py b/salt/base/_runners/event_ext.py → salt/_runners/event_ext.py
diff --git a/salt/base/_runners/wait.py → salt/_runners/wait.py b/salt/base/_runners/wait.py → salt/_runners/wait.py
diff --git a/salt/base/_sdb/googledrive.py → salt/_sdb/googledrive.py b/salt/base/_sdb/googledrive.py → salt/_sdb/googledrive.py
diff --git a/salt/base/_sdb/kdbx.py → salt/_sdb/kdbx.py b/salt/base/_sdb/kdbx.py → salt/_sdb/kdbx.py
diff --git a/salt/base/_sdb/kubectl.py → salt/_sdb/kubectl.py b/salt/base/_sdb/kubectl.py → salt/_sdb/kubectl.py
diff --git a/salt/base/_states/devtool.py → salt/_states/devtool.py b/salt/base/_states/devtool.py → salt/_states/devtool.py
diff --git a/salt/base/_states/dotfile.py → salt/_states/dotfile.py b/salt/base/_states/dotfile.py → salt/_states/dotfile.py
diff --git a/salt/base/_states/envops.py → salt/_states/envops.py b/salt/base/_states/envops.py → salt/_states/envops.py
diff --git a/salt/base/_states/file_ext.py → salt/_states/file_ext.py b/salt/base/_states/file_ext.py → salt/_states/file_ext.py
diff --git a/salt/base/_states/kubernetes.py → salt/_states/kubernetes.py b/salt/base/_states/kubernetes.py → salt/_states/kubernetes.py
diff --git a/salt/base/_states/pkgrepo_ext.py → salt/_states/pkgrepo_ext.py b/salt/base/_states/pkgrepo_ext.py → salt/_states/pkgrepo_ext.py
diff --git a/salt/base/_thorium/check.py → salt/_thorium/check.py b/salt/base/_thorium/check.py → salt/_thorium/check.py
diff --git a/salt/base/_thorium/reg_ext.py → salt/_thorium/reg_ext.py b/salt/base/_thorium/reg_ext.py → salt/_thorium/reg_ext.py
diff --git a/salt/base/_tops/foreman.py → salt/_tops/foreman.py b/salt/base/_tops/foreman.py → salt/_tops/foreman.py
diff --git a/salt/base/_utils/azurearm.py → salt/_utils/azurearm.py b/salt/base/_utils/azurearm.py → salt/_utils/azurearm.py
diff --git a/salt/base/_utils/common.py → salt/_utils/common.py b/salt/base/_utils/common.py → salt/_utils/common.py
diff --git a/salt/base/_utils/googledrive.py → salt/_utils/googledrive.py b/salt/base/_utils/googledrive.py → salt/_utils/googledrive.py
diff --git a/salt/base/_utils/k8s.py → salt/_utils/k8s.py b/salt/base/_utils/k8s.py → salt/_utils/k8s.py
diff --git a/salt/base/_utils/urlutils.py → salt/_utils/urlutils.py b/salt/base/_utils/urlutils.py → salt/_utils/urlutils.py
diff --git a/salt/dev/argocd/init.sls → salt/argocd/init.sls b/salt/dev/argocd/init.sls → salt/argocd/init.sls
diff --git a/salt/dev/argocd/map.jinja → salt/argocd/map.jinja b/salt/dev/argocd/map.jinja → salt/argocd/map.jinja
diff --git a/salt/dev/aws/init.sls → salt/aws/init.sls b/salt/dev/aws/init.sls → salt/aws/init.sls
diff --git a/salt/dev/aws/map.jinja → salt/aws/map.jinja b/salt/dev/aws/map.jinja → salt/aws/map.jinja
diff --git a/salt/dev/docker/compose/init.sls → salt/docker/compose/init.sls b/salt/dev/docker/compose/init.sls → salt/docker/compose/init.sls
diff --git a/salt/dev/docker/compose/map.jinja → salt/docker/compose/map.jinja b/salt/dev/docker/compose/map.jinja → salt/docker/compose/map.jinja
diff --git a/salt/dev/docker/compose/pillar.example.sls → salt/docker/compose/pillar.example.sls b/salt/dev/docker/compose/pillar.example.sls → salt/docker/compose/pillar.example.sls
diff --git a/salt/dev/docker/daemon.json → salt/docker/daemon.json b/salt/dev/docker/daemon.json → salt/docker/daemon.json
diff --git a/salt/dev/docker/events/engines.conf → salt/docker/events/engines.conf b/salt/dev/docker/events/engines.conf → salt/docker/events/engines.conf
diff --git a/salt/dev/docker/events/init.sls → salt/docker/events/init.sls b/salt/dev/docker/events/init.sls → salt/docker/events/init.sls
diff --git a/salt/dev/docker/events/map.jinja → salt/docker/events/map.jinja b/salt/dev/docker/events/map.jinja → salt/docker/events/map.jinja
diff --git a/salt/dev/docker/init.sls → salt/docker/init.sls b/salt/dev/docker/init.sls → salt/docker/init.sls
diff --git a/salt/dev/docker/map.jinja → salt/docker/map.jinja b/salt/dev/docker/map.jinja → salt/docker/map.jinja
diff --git a/salt/dev/docker/pillar.example.sls → salt/docker/pillar.example.sls b/salt/dev/docker/pillar.example.sls → salt/docker/pillar.example.sls
diff --git a/salt/dev/erlang/erlang.pref → salt/erlang/erlang.pref b/salt/dev/erlang/erlang.pref → salt/erlang/erlang.pref
diff --git a/salt/dev/erlang/init.sls → salt/erlang/init.sls b/salt/dev/erlang/init.sls → salt/erlang/init.sls
diff --git a/salt/dev/erlang/map.jinja → salt/erlang/map.jinja b/salt/dev/erlang/map.jinja → salt/erlang/map.jinja
diff --git a/salt/dev/erlang/pillar.example.sls → salt/erlang/pillar.example.sls b/salt/dev/erlang/pillar.example.sls → salt/erlang/pillar.example.sls
diff --git a/...r/foreman/config/dnsmasq.d/proxydhcp.conf → salt/foreman/config/dnsmasq.d/proxydhcp.conf b/...r/foreman/config/dnsmasq.d/proxydhcp.conf → salt/foreman/config/dnsmasq.d/proxydhcp.conf
diff --git a/.../server/foreman/config/dynflow/worker.yml → salt/foreman/config/dynflow/worker.yml b/.../server/foreman/config/dynflow/worker.yml → salt/foreman/config/dynflow/worker.yml
diff --git a/.../config/foreman-proxy/settings.d/salt.yml → .../config/foreman-proxy/settings.d/salt.yml b/.../config/foreman-proxy/settings.d/salt.yml → .../config/foreman-proxy/settings.d/salt.yml
diff --git a/salt/server/foreman/config/salt/foreman.yaml → salt/foreman/config/salt/foreman.yaml b/salt/server/foreman/config/salt/foreman.yaml → salt/foreman/config/salt/foreman.yaml
diff --git a/salt/server/foreman/config/tftp/ipxe.efi → salt/foreman/config/tftp/ipxe.efi b/salt/server/foreman/config/tftp/ipxe.efi → salt/foreman/config/tftp/ipxe.efi
diff --git a/salt/server/foreman/config/tftp/ldlinux.e32 → salt/foreman/config/tftp/ldlinux.e32 b/salt/server/foreman/config/tftp/ldlinux.e32 → salt/foreman/config/tftp/ldlinux.e32
diff --git a/salt/server/foreman/config/tftp/ldlinux.e64 → salt/foreman/config/tftp/ldlinux.e64 b/salt/server/foreman/config/tftp/ldlinux.e64 → salt/foreman/config/tftp/ldlinux.e64
diff --git a/...server/foreman/config/tftp/syslinux32.efi → salt/foreman/config/tftp/syslinux32.efi b/...server/foreman/config/tftp/syslinux32.efi → salt/foreman/config/tftp/syslinux32.efi
diff --git a/...server/foreman/config/tftp/syslinux64.efi → salt/foreman/config/tftp/syslinux64.efi b/...server/foreman/config/tftp/syslinux64.efi → salt/foreman/config/tftp/syslinux64.efi
diff --git a/salt/server/foreman/init.sls → salt/foreman/init.sls b/salt/server/foreman/init.sls → salt/foreman/init.sls
diff --git a/salt/server/foreman/map.jinja → salt/foreman/map.jinja b/salt/server/foreman/map.jinja → salt/foreman/map.jinja
diff --git a/salt/server/foreman/pillar.example.sls → salt/foreman/pillar.example.sls b/salt/server/foreman/pillar.example.sls → salt/foreman/pillar.example.sls
diff --git a/salt/dev/gatling/init.sls → salt/gatling/init.sls b/salt/dev/gatling/init.sls → salt/gatling/init.sls
diff --git a/salt/dev/gatling/map.jinja → salt/gatling/map.jinja b/salt/dev/gatling/map.jinja → salt/gatling/map.jinja
diff --git a/salt/dev/ghrunner/init.sls → salt/ghrunner/init.sls b/salt/dev/ghrunner/init.sls → salt/ghrunner/init.sls
diff --git a/salt/dev/ghrunner/map.jinja → salt/ghrunner/map.jinja b/salt/dev/ghrunner/map.jinja → salt/ghrunner/map.jinja
diff --git a/salt/dev/ghrunner/pillar.example.sls → salt/ghrunner/pillar.example.sls b/salt/dev/ghrunner/pillar.example.sls → salt/ghrunner/pillar.example.sls
diff --git a/salt/dev/gradle/init.sls → salt/gradle/init.sls b/salt/dev/gradle/init.sls → salt/gradle/init.sls
diff --git a/salt/dev/gradle/map.jinja → salt/gradle/map.jinja b/salt/dev/gradle/map.jinja → salt/gradle/map.jinja
diff --git a/salt/dev/gradle/pillar.example.sls → salt/gradle/pillar.example.sls b/salt/dev/gradle/pillar.example.sls → salt/gradle/pillar.example.sls
diff --git a/salt/dev/grafana/init.sls → salt/grafana/init.sls b/salt/dev/grafana/init.sls → salt/grafana/init.sls
diff --git a/salt/dev/grafana/map.jinja → salt/grafana/map.jinja b/salt/dev/grafana/map.jinja → salt/grafana/map.jinja
diff --git a/salt/dev/grafana/pillar.example.sls → salt/grafana/pillar.example.sls b/salt/dev/grafana/pillar.example.sls → salt/grafana/pillar.example.sls
diff --git a/salt/dev/influxdb/init.sls → salt/influxdb/init.sls b/salt/dev/influxdb/init.sls → salt/influxdb/init.sls
diff --git a/salt/dev/influxdb/map.jinja → salt/influxdb/map.jinja b/salt/dev/influxdb/map.jinja → salt/influxdb/map.jinja
diff --git a/salt/dev/influxdb/pillar.example.sls → salt/influxdb/pillar.example.sls b/salt/dev/influxdb/pillar.example.sls → salt/influxdb/pillar.example.sls
diff --git a/salt/dev/intellij/init.sls → salt/intellij/init.sls b/salt/dev/intellij/init.sls → salt/intellij/init.sls
diff --git a/salt/dev/intellij/map.jinja → salt/intellij/map.jinja b/salt/dev/intellij/map.jinja → salt/intellij/map.jinja
diff --git a/salt/dev/intellij/pillar.example.sls → salt/intellij/pillar.example.sls b/salt/dev/intellij/pillar.example.sls → salt/intellij/pillar.example.sls
diff --git a/salt/dev/java/init.sls → salt/java/init.sls b/salt/dev/java/init.sls → salt/java/init.sls
diff --git a/salt/dev/java/map.jinja → salt/java/map.jinja b/salt/dev/java/map.jinja → salt/java/map.jinja
diff --git a/salt/dev/java/openjdk.sls → salt/java/openjdk.sls b/salt/dev/java/openjdk.sls → salt/java/openjdk.sls
diff --git a/salt/dev/java/oracle.sls → salt/java/oracle.sls b/salt/dev/java/oracle.sls → salt/java/oracle.sls
diff --git a/salt/dev/java/pillar.example.sls → salt/java/pillar.example.sls b/salt/dev/java/pillar.example.sls → salt/java/pillar.example.sls
diff --git a/salt/dev/java/saltcheck-tests/init.tst → salt/java/saltcheck-tests/init.tst b/salt/dev/java/saltcheck-tests/init.tst → salt/java/saltcheck-tests/init.tst
diff --git a/salt/server/kannel/init.sls → salt/kannel/init.sls b/salt/server/kannel/init.sls → salt/kannel/init.sls
diff --git a/salt/server/kannel/kannel → salt/kannel/kannel b/salt/server/kannel/kannel → salt/kannel/kannel
diff --git a/salt/server/kannel/kannel.conf → salt/kannel/kannel.conf b/salt/server/kannel/kannel.conf → salt/kannel/kannel.conf
diff --git a/salt/server/kannel/map.jinja → salt/kannel/map.jinja b/salt/server/kannel/map.jinja → salt/kannel/map.jinja
diff --git a/salt/server/keepalived/config.sls → salt/keepalived/config.sls b/salt/server/keepalived/config.sls → salt/keepalived/config.sls
diff --git a/.../server/keepalived/configs/instances.conf → salt/keepalived/configs/instances.conf b/.../server/keepalived/configs/instances.conf → salt/keepalived/configs/instances.conf
diff --git a/...server/keepalived/configs/keepalived.conf → salt/keepalived/configs/keepalived.conf b/...server/keepalived/configs/keepalived.conf → salt/keepalived/configs/keepalived.conf
diff --git a/...er/keepalived/configs/virtual_server.conf → salt/keepalived/configs/virtual_server.conf b/...er/keepalived/configs/virtual_server.conf → salt/keepalived/configs/virtual_server.conf
diff --git a/salt/server/keepalived/init.sls → salt/keepalived/init.sls b/salt/server/keepalived/init.sls → salt/keepalived/init.sls
diff --git a/salt/server/keepalived/install.sls → salt/keepalived/install.sls b/salt/server/keepalived/install.sls → salt/keepalived/install.sls
diff --git a/salt/server/keepalived/map.jinja → salt/keepalived/map.jinja b/salt/server/keepalived/map.jinja → salt/keepalived/map.jinja
diff --git a/salt/server/keepalived/pillar.example.sls → salt/keepalived/pillar.example.sls b/salt/server/keepalived/pillar.example.sls → salt/keepalived/pillar.example.sls
diff --git a/salt/server/kubernetes/README.md → salt/kubernetes/README.md b/salt/server/kubernetes/README.md → salt/kubernetes/README.md
diff --git a/...erver/kubernetes/_orchestrate/cluster.sls → salt/kubernetes/_orchestrate/cluster.sls b/...erver/kubernetes/_orchestrate/cluster.sls → salt/kubernetes/_orchestrate/cluster.sls
diff --git a/...ubernetes/_orchestrate/pillar.example.sls → ...ubernetes/_orchestrate/pillar.example.sls b/...ubernetes/_orchestrate/pillar.example.sls → ...ubernetes/_orchestrate/pillar.example.sls
diff --git a/salt/server/kubernetes/client/config.sls → salt/kubernetes/client/config.sls b/salt/server/kubernetes/client/config.sls → salt/kubernetes/client/config.sls
diff --git a/salt/server/kubernetes/client/init.sls → salt/kubernetes/client/init.sls b/salt/server/kubernetes/client/init.sls → salt/kubernetes/client/init.sls
diff --git a/.../server/kubernetes/client/kubeconfig.yaml → salt/kubernetes/client/kubeconfig.yaml b/.../server/kubernetes/client/kubeconfig.yaml → salt/kubernetes/client/kubeconfig.yaml
diff --git a/salt/server/kubernetes/client/map.jinja → salt/kubernetes/client/map.jinja b/salt/server/kubernetes/client/map.jinja → salt/kubernetes/client/map.jinja
diff --git a/...rver/kubernetes/client/pillar.example.sls → salt/kubernetes/client/pillar.example.sls b/...rver/kubernetes/client/pillar.example.sls → salt/kubernetes/client/pillar.example.sls
diff --git a/salt/server/kubernetes/helm/init.sls → salt/kubernetes/helm/init.sls b/salt/server/kubernetes/helm/init.sls → salt/kubernetes/helm/init.sls
diff --git a/salt/server/kubernetes/helm/map.jinja → salt/kubernetes/helm/map.jinja b/salt/server/kubernetes/helm/map.jinja → salt/kubernetes/helm/map.jinja
diff --git a/...server/kubernetes/helm/pillar.example.sls → salt/kubernetes/helm/pillar.example.sls b/...server/kubernetes/helm/pillar.example.sls → salt/kubernetes/helm/pillar.example.sls
diff --git a/salt/server/kubernetes/kubeadm/init.sls → salt/kubernetes/kubeadm/init.sls b/salt/server/kubernetes/kubeadm/init.sls → salt/kubernetes/kubeadm/init.sls
diff --git a/salt/server/kubernetes/kubeadm/install.sls → salt/kubernetes/kubeadm/install.sls b/salt/server/kubernetes/kubeadm/install.sls → salt/kubernetes/kubeadm/install.sls
diff --git a/.../server/kubernetes/kubeadm/requisites.sls → salt/kubernetes/kubeadm/requisites.sls b/.../server/kubernetes/kubeadm/requisites.sls → salt/kubernetes/kubeadm/requisites.sls
diff --git a/salt/server/kubernetes/map.jinja → salt/kubernetes/map.jinja b/salt/server/kubernetes/map.jinja → salt/kubernetes/map.jinja
diff --git a/salt/server/kubernetes/master/init.sls → salt/kubernetes/master/init.sls b/salt/server/kubernetes/master/init.sls → salt/kubernetes/master/init.sls
diff --git a/salt/server/kubernetes/master/map.jinja → salt/kubernetes/master/map.jinja b/salt/server/kubernetes/master/map.jinja → salt/kubernetes/master/map.jinja
diff --git a/...rver/kubernetes/master/pillar.example.sls → salt/kubernetes/master/pillar.example.sls b/...rver/kubernetes/master/pillar.example.sls → salt/kubernetes/master/pillar.example.sls
diff --git a/salt/server/kubernetes/master/setup/ca.sls → salt/kubernetes/master/setup/ca.sls b/salt/server/kubernetes/master/setup/ca.sls → salt/kubernetes/master/setup/ca.sls
diff --git a/.../server/kubernetes/master/setup/first.sls → salt/kubernetes/master/setup/first.sls b/.../server/kubernetes/master/setup/first.sls → salt/kubernetes/master/setup/first.sls
diff --git a/salt/server/kubernetes/master/setup/init.sls → salt/kubernetes/master/setup/init.sls b/salt/server/kubernetes/master/setup/init.sls → salt/kubernetes/master/setup/init.sls
diff --git a/.../server/kubernetes/master/setup/other.sls → salt/kubernetes/master/setup/other.sls b/.../server/kubernetes/master/setup/other.sls → salt/kubernetes/master/setup/other.sls
diff --git a/salt/server/kubernetes/minikube/init.sls → salt/kubernetes/minikube/init.sls b/salt/server/kubernetes/minikube/init.sls → salt/kubernetes/minikube/init.sls
diff --git a/salt/server/kubernetes/minikube/kvm2.sls → salt/kubernetes/minikube/kvm2.sls b/salt/server/kubernetes/minikube/kvm2.sls → salt/kubernetes/minikube/kvm2.sls
diff --git a/salt/server/kubernetes/minikube/map.jinja → salt/kubernetes/minikube/map.jinja b/salt/server/kubernetes/minikube/map.jinja → salt/kubernetes/minikube/map.jinja
diff --git a/...rver/kubernetes/minikube/minikube_bin.sls → salt/kubernetes/minikube/minikube_bin.sls b/...rver/kubernetes/minikube/minikube_bin.sls → salt/kubernetes/minikube/minikube_bin.sls
diff --git a/...er/kubernetes/minikube/minikube_setup.sls → salt/kubernetes/minikube/minikube_setup.sls b/...er/kubernetes/minikube/minikube_setup.sls → salt/kubernetes/minikube/minikube_setup.sls
diff --git a/salt/server/kubernetes/minikube/none.sls → salt/kubernetes/minikube/none.sls b/salt/server/kubernetes/minikube/none.sls → salt/kubernetes/minikube/none.sls
diff --git a/...er/kubernetes/minikube/pillar.example.sls → salt/kubernetes/minikube/pillar.example.sls b/...er/kubernetes/minikube/pillar.example.sls → salt/kubernetes/minikube/pillar.example.sls
diff --git a/salt/server/kubernetes/network/calico.sls → salt/kubernetes/network/calico.sls b/salt/server/kubernetes/network/calico.sls → salt/kubernetes/network/calico.sls
diff --git a/salt/server/kubernetes/network/flannel.sls → salt/kubernetes/network/flannel.sls b/salt/server/kubernetes/network/flannel.sls → salt/kubernetes/network/flannel.sls
diff --git a/salt/server/kubernetes/network/init.sls → salt/kubernetes/network/init.sls b/salt/server/kubernetes/network/init.sls → salt/kubernetes/network/init.sls
diff --git a/salt/server/kubernetes/network/map.jinja → salt/kubernetes/network/map.jinja b/salt/server/kubernetes/network/map.jinja → salt/kubernetes/network/map.jinja
diff --git a/salt/server/kubernetes/untaint.sh → salt/kubernetes/untaint.sh b/salt/server/kubernetes/untaint.sh → salt/kubernetes/untaint.sh
diff --git a/salt/server/kubernetes/worker/init.sls → salt/kubernetes/worker/init.sls b/salt/server/kubernetes/worker/init.sls → salt/kubernetes/worker/init.sls
diff --git a/salt/server/kubernetes/worker/map.jinja → salt/kubernetes/worker/map.jinja b/salt/server/kubernetes/worker/map.jinja → salt/kubernetes/worker/map.jinja
diff --git a/...rver/kubernetes/worker/pillar.example.sls → salt/kubernetes/worker/pillar.example.sls b/...rver/kubernetes/worker/pillar.example.sls → salt/kubernetes/worker/pillar.example.sls
diff --git a/salt/server/kubernetes/worker/setup.sls → salt/kubernetes/worker/setup.sls b/salt/server/kubernetes/worker/setup.sls → salt/kubernetes/worker/setup.sls
diff --git a/salt/server/kvm/init.sls → salt/kvm/init.sls b/salt/server/kvm/init.sls → salt/kvm/init.sls
diff --git a/salt/server/kvm/install.sls → salt/kvm/install.sls b/salt/server/kvm/install.sls → salt/kvm/install.sls
diff --git a/salt/server/kvm/map.jinja → salt/kvm/map.jinja b/salt/server/kvm/map.jinja → salt/kvm/map.jinja
diff --git a/salt/server/kvm/pillar.example.sls → salt/kvm/pillar.example.sls b/salt/server/kvm/pillar.example.sls → salt/kvm/pillar.example.sls
diff --git a/salt/server/kvm/vfio.sls → salt/kvm/vfio.sls b/salt/server/kvm/vfio.sls → salt/kvm/vfio.sls
diff --git a/salt/server/lvs/README.md → salt/lvs/README.md b/salt/server/lvs/README.md → salt/lvs/README.md
diff --git a/salt/server/lvs/_orchestrate/realservers.sls → salt/lvs/_orchestrate/realservers.sls b/salt/server/lvs/_orchestrate/realservers.sls → salt/lvs/_orchestrate/realservers.sls
diff --git a/...erver/lvs/_orchestrate/virtualservers.sls → salt/lvs/_orchestrate/virtualservers.sls b/...erver/lvs/_orchestrate/virtualservers.sls → salt/lvs/_orchestrate/virtualservers.sls
diff --git a/salt/server/lvs/_reactor/virtualserver.sls → salt/lvs/_reactor/virtualserver.sls b/salt/server/lvs/_reactor/virtualserver.sls → salt/lvs/_reactor/virtualserver.sls
diff --git a/salt/server/lvs/director/init.sls → salt/lvs/director/init.sls b/salt/server/lvs/director/init.sls → salt/lvs/director/init.sls
diff --git a/salt/server/lvs/director/pillar.example.sls → salt/lvs/director/pillar.example.sls b/salt/server/lvs/director/pillar.example.sls → salt/lvs/director/pillar.example.sls
diff --git a/salt/server/lvs/map.jinja → salt/lvs/map.jinja b/salt/server/lvs/map.jinja → salt/lvs/map.jinja
diff --git a/salt/server/lvs/realserver/init.sls → salt/lvs/realserver/init.sls b/salt/server/lvs/realserver/init.sls → salt/lvs/realserver/init.sls
diff --git a/.../server/lvs/realserver/pillar.example.sls → salt/lvs/realserver/pillar.example.sls b/.../server/lvs/realserver/pillar.example.sls → salt/lvs/realserver/pillar.example.sls
diff --git a/salt/base/lxc/_reactor/lxc.sls → salt/lxc/_reactor/lxc.sls b/salt/base/lxc/_reactor/lxc.sls → salt/lxc/_reactor/lxc.sls
diff --git a/salt/base/lxc/containers.sls → salt/lxc/containers.sls b/salt/base/lxc/containers.sls → salt/lxc/containers.sls
diff --git a/salt/base/lxc/init.sls → salt/lxc/init.sls b/salt/base/lxc/init.sls → salt/lxc/init.sls
diff --git a/salt/base/lxc/install.sls → salt/lxc/install.sls b/salt/base/lxc/install.sls → salt/lxc/install.sls
diff --git a/salt/base/lxc/lxc-net → salt/lxc/lxc-net b/salt/base/lxc/lxc-net → salt/lxc/lxc-net
diff --git a/salt/base/lxc/map.jinja → salt/lxc/map.jinja b/salt/base/lxc/map.jinja → salt/lxc/map.jinja
diff --git a/salt/base/lxc/pillar.example.sls → salt/lxc/pillar.example.sls b/salt/base/lxc/pillar.example.sls → salt/lxc/pillar.example.sls
diff --git a/salt/base/lxc/saltcheck-tests/init.tst → salt/lxc/saltcheck-tests/init.tst b/salt/base/lxc/saltcheck-tests/init.tst → salt/lxc/saltcheck-tests/init.tst
diff --git a/salt/base/mail/init.sls → salt/mail/init.sls b/salt/base/mail/init.sls → salt/mail/init.sls
diff --git a/salt/base/mail/map.jinja → salt/mail/map.jinja b/salt/base/mail/map.jinja → salt/mail/map.jinja
diff --git a/salt/base/mail/pillar.example.sls → salt/mail/pillar.example.sls b/salt/base/mail/pillar.example.sls → salt/mail/pillar.example.sls
diff --git a/salt/base/mail/templates/email-addresses → salt/mail/templates/email-addresses b/salt/base/mail/templates/email-addresses → salt/mail/templates/email-addresses
diff --git a/salt/base/mail/templates/passwd → salt/mail/templates/passwd b/salt/base/mail/templates/passwd → salt/mail/templates/passwd
diff --git a/salt/base/mail/templates/passwd.client → salt/mail/templates/passwd.client b/salt/base/mail/templates/passwd.client → salt/mail/templates/passwd.client
diff --git a/...ase/mail/templates/update-exim4.conf.conf → salt/mail/templates/update-exim4.conf.conf b/...ase/mail/templates/update-exim4.conf.conf → salt/mail/templates/update-exim4.conf.conf
diff --git a/salt/dev/maven/init.sls → salt/maven/init.sls b/salt/dev/maven/init.sls → salt/maven/init.sls
diff --git a/salt/dev/maven/map.jinja → salt/maven/map.jinja b/salt/dev/maven/map.jinja → salt/maven/map.jinja
diff --git a/salt/dev/maven/pillar.example.sls → salt/maven/pillar.example.sls b/salt/dev/maven/pillar.example.sls → salt/maven/pillar.example.sls
diff --git a/salt/base/minion/README.md → salt/minion/README.md b/salt/base/minion/README.md → salt/minion/README.md
diff --git a/salt/base/minion/init.sls → salt/minion/init.sls b/salt/base/minion/init.sls → salt/minion/init.sls
diff --git a/salt/base/minion/map.jinja → salt/minion/map.jinja b/salt/base/minion/map.jinja → salt/minion/map.jinja
diff --git a/salt/base/minion/patch.sls → salt/minion/patch.sls b/salt/base/minion/patch.sls → salt/minion/patch.sls
diff --git a/salt/base/minion/patches/debian_eth.jinja → salt/minion/patches/debian_eth.jinja b/salt/base/minion/patches/debian_eth.jinja → salt/minion/patches/debian_eth.jinja
diff --git a/salt/base/minion/pillar.example.sls → salt/minion/pillar.example.sls b/salt/base/minion/pillar.example.sls → salt/minion/pillar.example.sls
diff --git a/salt/base/minion/restart.sls → salt/minion/restart.sls b/salt/base/minion/restart.sls → salt/minion/restart.sls
diff --git a/salt/base/minion/startup.sls → salt/minion/startup.sls b/salt/base/minion/startup.sls → salt/minion/startup.sls
diff --git a/salt/base/minion/upgrade.sls → salt/minion/upgrade.sls b/salt/base/minion/upgrade.sls → salt/minion/upgrade.sls
diff --git a/salt/dev/mongodb/client/init.sls → salt/mongodb/client/init.sls b/salt/dev/mongodb/client/init.sls → salt/mongodb/client/init.sls
diff --git a/salt/dev/mongodb/client/map.jinja → salt/mongodb/client/map.jinja b/salt/dev/mongodb/client/map.jinja → salt/mongodb/client/map.jinja
diff --git a/...godb/server/cluster/_orchestrate/orch.sls → ...godb/server/cluster/_orchestrate/orch.sls b/...godb/server/cluster/_orchestrate/orch.sls → ...godb/server/cluster/_orchestrate/orch.sls
diff --git a/...server/cluster/_orchestrate/replicate.sls → ...server/cluster/_orchestrate/replicate.sls b/...server/cluster/_orchestrate/replicate.sls → ...server/cluster/_orchestrate/replicate.sls
diff --git a/.../dev/mongodb/server/cluster/configure.sls → salt/mongodb/server/cluster/configure.sls b/.../dev/mongodb/server/cluster/configure.sls → salt/mongodb/server/cluster/configure.sls
diff --git a/salt/dev/mongodb/server/cluster/init.sls → salt/mongodb/server/cluster/init.sls b/salt/dev/mongodb/server/cluster/init.sls → salt/mongodb/server/cluster/init.sls
diff --git a/salt/dev/mongodb/server/cluster/map.jinja → salt/mongodb/server/cluster/map.jinja b/salt/dev/mongodb/server/cluster/map.jinja → salt/mongodb/server/cluster/map.jinja
diff --git a/salt/dev/mongodb/server/macros.jinja → salt/mongodb/server/macros.jinja b/salt/dev/mongodb/server/macros.jinja → salt/mongodb/server/macros.jinja
diff --git a/salt/dev/mongodb/server/mongod.conf → salt/mongodb/server/mongod.conf b/salt/dev/mongodb/server/mongod.conf → salt/mongodb/server/mongod.conf
diff --git a/salt/dev/mongodb/server/mongod.init → salt/mongodb/server/mongod.init b/salt/dev/mongodb/server/mongod.init → salt/mongodb/server/mongod.init
diff --git a/salt/dev/mongodb/server/mongod.service → salt/mongodb/server/mongod.service b/salt/dev/mongodb/server/mongod.service → salt/mongodb/server/mongod.service
diff --git a/salt/dev/mongodb/server/single/configure.sls → salt/mongodb/server/single/configure.sls b/salt/dev/mongodb/server/single/configure.sls → salt/mongodb/server/single/configure.sls
diff --git a/salt/dev/mongodb/server/single/init.sls → salt/mongodb/server/single/init.sls b/salt/dev/mongodb/server/single/init.sls → salt/mongodb/server/single/init.sls
diff --git a/salt/dev/mongodb/server/single/install.sls → salt/mongodb/server/single/install.sls b/salt/dev/mongodb/server/single/install.sls → salt/mongodb/server/single/install.sls
diff --git a/salt/dev/mongodb/server/single/map.jinja → salt/mongodb/server/single/map.jinja b/salt/dev/mongodb/server/single/map.jinja → salt/mongodb/server/single/map.jinja
diff --git a/salt/base/os/groups/init.sls → salt/os/groups/init.sls b/salt/base/os/groups/init.sls → salt/os/groups/init.sls
diff --git a/salt/base/os/groups/map.jinja → salt/os/groups/map.jinja b/salt/base/os/groups/map.jinja → salt/os/groups/map.jinja
diff --git a/salt/base/os/groups/pillar.example.sls → salt/os/groups/pillar.example.sls b/salt/base/os/groups/pillar.example.sls → salt/os/groups/pillar.example.sls
diff --git a/salt/base/os/hosts/init.sls → salt/os/hosts/init.sls b/salt/base/os/hosts/init.sls → salt/os/hosts/init.sls
diff --git a/salt/base/os/hosts/map.jinja → salt/os/hosts/map.jinja b/salt/base/os/hosts/map.jinja → salt/os/hosts/map.jinja
diff --git a/salt/base/os/hosts/pillar.example.sls → salt/os/hosts/pillar.example.sls b/salt/base/os/hosts/pillar.example.sls → salt/os/hosts/pillar.example.sls
diff --git a/salt/base/os/init.sls → salt/os/init.sls b/salt/base/os/init.sls → salt/os/init.sls
diff --git a/salt/base/os/locale/init.sls → salt/os/locale/init.sls b/salt/base/os/locale/init.sls → salt/os/locale/init.sls
diff --git a/salt/base/os/locale/map.jinja → salt/os/locale/map.jinja b/salt/base/os/locale/map.jinja → salt/os/locale/map.jinja
diff --git a/salt/base/os/locale/pillar.example.sls → salt/os/locale/pillar.example.sls b/salt/base/os/locale/pillar.example.sls → salt/os/locale/pillar.example.sls
diff --git a/salt/base/os/modules/init.sls → salt/os/modules/init.sls b/salt/base/os/modules/init.sls → salt/os/modules/init.sls
diff --git a/salt/base/os/modules/map.jinja → salt/os/modules/map.jinja b/salt/base/os/modules/map.jinja → salt/os/modules/map.jinja
diff --git a/salt/base/os/modules/pillar.example.sls → salt/os/modules/pillar.example.sls b/salt/base/os/modules/pillar.example.sls → salt/os/modules/pillar.example.sls
diff --git a/salt/base/os/mounts/init.sls → salt/os/mounts/init.sls b/salt/base/os/mounts/init.sls → salt/os/mounts/init.sls
diff --git a/salt/base/os/mounts/map.jinja → salt/os/mounts/map.jinja b/salt/base/os/mounts/map.jinja → salt/os/mounts/map.jinja
diff --git a/salt/base/os/mounts/pillar.example.sls → salt/os/mounts/pillar.example.sls b/salt/base/os/mounts/pillar.example.sls → salt/os/mounts/pillar.example.sls
diff --git a/salt/base/os/network/init.sls → salt/os/network/init.sls b/salt/base/os/network/init.sls → salt/os/network/init.sls
diff --git a/salt/base/os/network/map.jinja → salt/os/network/map.jinja b/salt/base/os/network/map.jinja → salt/os/network/map.jinja
diff --git a/salt/base/os/network/pillar.example.sls → salt/os/network/pillar.example.sls b/salt/base/os/network/pillar.example.sls → salt/os/network/pillar.example.sls
diff --git a/salt/base/os/pillar.example.sls → salt/os/pillar.example.sls b/salt/base/os/pillar.example.sls → salt/os/pillar.example.sls
diff --git a/salt/base/os/pkgs/init.sls → salt/os/pkgs/init.sls b/salt/base/os/pkgs/init.sls → salt/os/pkgs/init.sls
diff --git a/salt/base/os/pkgs/map.jinja → salt/os/pkgs/map.jinja b/salt/base/os/pkgs/map.jinja → salt/os/pkgs/map.jinja
diff --git a/salt/base/os/pkgs/pillar.example.sls → salt/os/pkgs/pillar.example.sls b/salt/base/os/pkgs/pillar.example.sls → salt/os/pkgs/pillar.example.sls
diff --git a/salt/base/os/pkgs/scripts/init.sls → salt/os/pkgs/scripts/init.sls b/salt/base/os/pkgs/scripts/init.sls → salt/os/pkgs/scripts/init.sls
diff --git a/salt/base/os/pkgs/unattended/init.sls → salt/os/pkgs/unattended/init.sls b/salt/base/os/pkgs/unattended/init.sls → salt/os/pkgs/unattended/init.sls
diff --git a/salt/base/os/pkgs/unattended/map.jinja → salt/os/pkgs/unattended/map.jinja b/salt/base/os/pkgs/unattended/map.jinja → salt/os/pkgs/unattended/map.jinja
diff --git a/...ase/os/pkgs/unattended/pillar.example.sls → salt/os/pkgs/unattended/pillar.example.sls b/...ase/os/pkgs/unattended/pillar.example.sls → salt/os/pkgs/unattended/pillar.example.sls
diff --git a/.../pkgs/unattended/templates/periodic.jinja → .../pkgs/unattended/templates/periodic.jinja b/.../pkgs/unattended/templates/periodic.jinja → .../pkgs/unattended/templates/periodic.jinja
diff --git a/...ended/templates/unattended-upgrades.jinja → ...ended/templates/unattended-upgrades.jinja b/...ended/templates/unattended-upgrades.jinja → ...ended/templates/unattended-upgrades.jinja
diff --git a/salt/base/os/repositories/init.sls → salt/os/repositories/init.sls b/salt/base/os/repositories/init.sls → salt/os/repositories/init.sls
diff --git a/salt/base/os/repositories/map.jinja → salt/os/repositories/map.jinja b/salt/base/os/repositories/map.jinja → salt/os/repositories/map.jinja
diff --git a/salt/base/os/repositories/pillar.example.sls → salt/os/repositories/pillar.example.sls b/salt/base/os/repositories/pillar.example.sls → salt/os/repositories/pillar.example.sls
diff --git a/salt/base/os/repositories/template.pref → salt/os/repositories/template.pref b/salt/base/os/repositories/template.pref → salt/os/repositories/template.pref
diff --git a/salt/base/os/saltcheck-tests/init.tst → salt/os/saltcheck-tests/init.tst b/salt/base/os/saltcheck-tests/init.tst → salt/os/saltcheck-tests/init.tst
diff --git a/salt/base/os/services/init.sls → salt/os/services/init.sls b/salt/base/os/services/init.sls → salt/os/services/init.sls
diff --git a/salt/base/os/services/map.jinja → salt/os/services/map.jinja b/salt/base/os/services/map.jinja → salt/os/services/map.jinja
diff --git a/salt/base/rclone/init.sls → salt/rclone/init.sls b/salt/base/rclone/init.sls → salt/rclone/init.sls
diff --git a/salt/base/rclone/map.jinja → salt/rclone/map.jinja b/salt/base/rclone/map.jinja → salt/rclone/map.jinja
diff --git a/salt/base/rclone/pillar.example.sls → salt/rclone/pillar.example.sls b/salt/base/rclone/pillar.example.sls → salt/rclone/pillar.example.sls
diff --git a/salt/dev/rebar/init.sls → salt/rebar/init.sls b/salt/dev/rebar/init.sls → salt/rebar/init.sls
diff --git a/salt/dev/rebar/map.jinja → salt/rebar/map.jinja b/salt/dev/rebar/map.jinja → salt/rebar/map.jinja
diff --git a/salt/dev/rebar/pillar.example.sls → salt/rebar/pillar.example.sls b/salt/dev/rebar/pillar.example.sls → salt/rebar/pillar.example.sls
diff --git a/salt/dev/redis/README.md → salt/redis/README.md b/salt/dev/redis/README.md → salt/redis/README.md
diff --git a/salt/dev/redis/client/init.sls → salt/redis/client/init.sls b/salt/dev/redis/client/init.sls → salt/redis/client/init.sls
diff --git a/salt/dev/redis/client/map.jinja → salt/redis/client/map.jinja b/salt/dev/redis/client/map.jinja → salt/redis/client/map.jinja
diff --git a/salt/dev/redis/server/configure_cluster.sls → salt/redis/server/configure_cluster.sls b/salt/dev/redis/server/configure_cluster.sls → salt/redis/server/configure_cluster.sls
diff --git a/salt/dev/redis/server/configure_single.sls → salt/redis/server/configure_single.sls b/salt/dev/redis/server/configure_single.sls → salt/redis/server/configure_single.sls
diff --git a/salt/dev/redis/server/init.sls → salt/redis/server/init.sls b/salt/dev/redis/server/init.sls → salt/redis/server/init.sls
diff --git a/salt/dev/redis/server/install.sls → salt/redis/server/install.sls b/salt/dev/redis/server/install.sls → salt/redis/server/install.sls
diff --git a/salt/dev/redis/server/macros.jinja → salt/redis/server/macros.jinja b/salt/dev/redis/server/macros.jinja → salt/redis/server/macros.jinja
diff --git a/salt/dev/redis/server/map.jinja → salt/redis/server/map.jinja b/salt/dev/redis/server/map.jinja → salt/redis/server/map.jinja
diff --git a/salt/dev/redis/server/pillar.example.sls → salt/redis/server/pillar.example.sls b/salt/dev/redis/server/pillar.example.sls → salt/redis/server/pillar.example.sls
diff --git a/salt/dev/redis/server/redis.conf → salt/redis/server/redis.conf b/salt/dev/redis/server/redis.conf → salt/redis/server/redis.conf
diff --git a/salt/dev/redis/server/redis.init → salt/redis/server/redis.init b/salt/dev/redis/server/redis.init → salt/redis/server/redis.init
diff --git a/salt/dev/redis/server/[email protected] → salt/redis/server/[email protected] b/salt/dev/redis/server/[email protected] → salt/redis/server/[email protected]
diff --git a/salt/server/salt/api.sls → salt/salt/api.sls b/salt/server/salt/api.sls → salt/salt/api.sls
diff --git a/salt/server/salt/map.jinja → salt/salt/map.jinja b/salt/server/salt/map.jinja → salt/salt/map.jinja
diff --git a/salt/server/salt/master.sls → salt/salt/master.sls b/salt/server/salt/master.sls → salt/salt/master.sls
diff --git a/salt/server/salt/pillar.example.sls → salt/salt/pillar.example.sls b/salt/server/salt/pillar.example.sls → salt/salt/pillar.example.sls
diff --git a/salt/server/salt/repository.sls → salt/salt/repository.sls b/salt/server/salt/repository.sls → salt/salt/repository.sls
diff --git a/salt/server/salt/ssh.sls → salt/salt/ssh.sls b/salt/server/salt/ssh.sls → salt/salt/ssh.sls
diff --git a/salt/base/samba/client.sls → salt/samba/client.sls b/salt/base/samba/client.sls → salt/samba/client.sls
diff --git a/salt/base/samba/init.sls → salt/samba/init.sls b/salt/base/samba/init.sls → salt/samba/init.sls
diff --git a/salt/base/samba/map.jinja → salt/samba/map.jinja b/salt/base/samba/map.jinja → salt/samba/map.jinja
diff --git a/salt/base/samba/pam_mount.conf.xml → salt/samba/pam_mount.conf.xml b/salt/base/samba/pam_mount.conf.xml → salt/samba/pam_mount.conf.xml
diff --git a/salt/base/samba/pillar.example.sls → salt/samba/pillar.example.sls b/salt/base/samba/pillar.example.sls → salt/samba/pillar.example.sls
diff --git a/salt/dev/sbt/init.sls → salt/sbt/init.sls b/salt/dev/sbt/init.sls → salt/sbt/init.sls
diff --git a/salt/dev/sbt/map.jinja → salt/sbt/map.jinja b/salt/dev/sbt/map.jinja → salt/sbt/map.jinja
diff --git a/salt/dev/sbt/pillar.example.sls → salt/sbt/pillar.example.sls b/salt/dev/sbt/pillar.example.sls → salt/sbt/pillar.example.sls
diff --git a/salt/dev/scala/init.sls → salt/scala/init.sls b/salt/dev/scala/init.sls → salt/scala/init.sls
diff --git a/salt/dev/scala/map.jinja → salt/scala/map.jinja b/salt/dev/scala/map.jinja → salt/scala/map.jinja
diff --git a/salt/dev/scala/pillar.example.sls → salt/scala/pillar.example.sls b/salt/dev/scala/pillar.example.sls → salt/scala/pillar.example.sls
diff --git a/salt/base/users/README.md → salt/users/README.md b/salt/base/users/README.md → salt/users/README.md
diff --git a/salt/base/users/common.sls → salt/users/common.sls b/salt/base/users/common.sls → salt/users/common.sls
diff --git a/salt/base/users/cron.sls → salt/users/cron.sls b/salt/base/users/cron.sls → salt/users/cron.sls
diff --git a/salt/base/users/dotfiles.sls → salt/users/dotfiles.sls b/salt/base/users/dotfiles.sls → salt/users/dotfiles.sls
diff --git a/salt/base/users/init.sls → salt/users/init.sls b/salt/base/users/init.sls → salt/users/init.sls
diff --git a/salt/base/users/keys/gpg.sls → salt/users/keys/gpg.sls b/salt/base/users/keys/gpg.sls → salt/users/keys/gpg.sls
diff --git a/salt/base/users/keys/init.sls → salt/users/keys/init.sls b/salt/base/users/keys/init.sls → salt/users/keys/init.sls
diff --git a/salt/base/users/keys/ssh.sls → salt/users/keys/ssh.sls b/salt/base/users/keys/ssh.sls → salt/users/keys/ssh.sls
diff --git a/salt/base/users/pillar.example.sls → salt/users/pillar.example.sls b/salt/base/users/pillar.example.sls → salt/users/pillar.example.sls
diff --git a/salt/dev/users/projects/clone.sls → salt/users/projects/clone.sls b/salt/dev/users/projects/clone.sls → salt/users/projects/clone.sls
diff --git a/salt/dev/users/projects/init.sls → salt/users/projects/init.sls b/salt/dev/users/projects/init.sls → salt/users/projects/init.sls
diff --git a/salt/dev/users/projects/setup.sls → salt/users/projects/setup.sls b/salt/dev/users/projects/setup.sls → salt/users/projects/setup.sls
diff --git a/salt/base/users/saltcheck-tests/init.tst → salt/users/saltcheck-tests/init.tst b/salt/base/users/saltcheck-tests/init.tst → salt/users/saltcheck-tests/init.tst
diff --git a/salt/base/users/users.jinja → salt/users/users.jinja b/salt/base/users/users.jinja → salt/users/users.jinja
diff --git a/salt/base/users/vpn.sls → salt/users/vpn.sls b/salt/base/users/vpn.sls → salt/users/vpn.sls
diff --git a/salt/server/vagrant/init.sls → salt/vagrant/init.sls b/salt/server/vagrant/init.sls → salt/vagrant/init.sls
diff --git a/salt/server/vagrant/map.jinja → salt/vagrant/map.jinja b/salt/server/vagrant/map.jinja → salt/vagrant/map.jinja
diff --git a/salt/server/vagrant/pillar.example.sls → salt/vagrant/pillar.example.sls b/salt/server/vagrant/pillar.example.sls → salt/vagrant/pillar.example.sls
diff --git a/salt/dev/virtualbox/init.sls → salt/virtualbox/init.sls b/salt/dev/virtualbox/init.sls → salt/virtualbox/init.sls
diff --git a/salt/dev/virtualbox/map.jinja → salt/virtualbox/map.jinja b/salt/dev/virtualbox/map.jinja → salt/virtualbox/map.jinja
diff --git a/salt/dev/virtualbox/pillar.example.sls → salt/virtualbox/pillar.example.sls b/salt/dev/virtualbox/pillar.example.sls → salt/virtualbox/pillar.example.sls
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,8 +19,6 @@ fileserver_backend: @@
     env_order:
       - empty
       - base
-      - dev
-      - server
     # mine for test purposes
     mine_functions:
@@ Expand Down @@