removed password.sls, which shouldn't exist yet

pillars/roles.jinja

@@ -0,0 +1 @@
+{%- set roles=salt.cmd.shell("grep -Po '(?<=- ).*' /srv/salt/"+saltenv+"/pillars/servers/roles/server/"+grains['host']+".sls").split('\n') -%}

pillars/roles/aurpkgs/init.sls

@@ -1,9 +1,9 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.aurpkgs.none
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- if 'aurrepo' in roles -%}
-    {%- if 'aurrepo' in grains['roles'] -%}
     {%- for state in states %}
       {%- if state.startswith("pillars.roles.aurpkgs.") -%}
         {%- set role = state.split('.')[3] %}
@@ -11,11 +11,10 @@ include:
       {%- endif -%}
     {%- endfor -%}
   {%- else -%}
-      {%- for role in grains['roles'] %}
+    {%- for role in roles %}
       {%- if 'pillars.roles.aurpkgs.'+role in states %}
   - roles.aurpkgs.{{ role }}
       {%- endif -%}
     {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/backup/init.sls

@@ -1,9 +1,9 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.backup.none
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- if 'backup' in roles -%}
-    {%- if 'backup' in grains['roles'] -%}
     {%- for state in states %}
       {%- if state.startswith("pillars.roles.backup.") -%}
         {%- set role = state.split('.')[3] %}
@@ -11,11 +11,10 @@ include:
       {%- endif -%}
     {%- endfor -%}
   {%- else -%}
-      {%- for role in grains['roles'] %}
+    {%- for role in roles %}
       {%- if 'pillars.roles.backup.'+role in states %}
   - roles.backup.{{ role }}
       {%- endif -%}
     {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/ca/init.sls

@@ -1,9 +1,9 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.ca.none
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- if 'ca' in roles -%}
-    {%- if 'ca' in grains['roles'] -%}
     {%- for state in states %}
       {%- if state.startswith("pillars.roles.ca.") -%}
         {%- set role = state.split('.')[3] %}
@@ -11,11 +11,10 @@ include:
       {%- endif -%}
     {%- endfor -%}
   {%- else -%}
-      {%- for role in grains['roles'] %}
+    {%- for role in roles %}
       {%- if 'pillars.roles.ca.'+role in states %}
   - roles.ca.{{ role }}
       {%- endif -%}
     {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/database/init.sls

@@ -1,9 +1,9 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.database.none
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- if 'mysql' in roles -%}
-    {%- if 'mysql' in grains['roles'] -%}
     {%- for state in states %}
       {%- if state.startswith("pillars.roles.database.") -%}
         {%- set role = state.split('.')[3] %}
@@ -12,4 +12,3 @@ include:
     {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/firewalld/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.firewalld.core
 
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- for role in roles %}
-    {%- for role in grains['roles'] %}
     {%- if 'pillars.roles.firewalld.'+role in states %}
   - roles.firewalld.{{ role }}
     {%- endif -%}
   {%- endfor -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/git/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.git.none
 
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- for role in roles %}
-    {%- for role in grains['roles'] %}
     {%- if 'pillars.roles.git.'+role in states %}
   - roles.git.{{ role }}
     {%- endif -%}
   {%- endfor -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/gitea/init.sls

@@ -1,13 +0,0 @@
-{% set states = salt['cp.list_states'](saltenv) %}
-include:
-  - roles.git.none
-
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.git.'+role in states %}
-  - roles.git.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
-{%- endif -%}

pillars/roles/gitea/portal.sls

@@ -1,25 +0,0 @@
-git:
-  tmux-root:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/tmux.git"
-    path: "/root/tmux"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-  tmux-ejparker:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/tmux.git"
-    path: "/ejparker/tmux"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-  web:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/portal.git"
-    path: "/srv/http/portal"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"

pillars/roles/gitea/saltmaster.sls

@@ -1,17 +0,0 @@
-git:
-  salt:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
-    path: "/srv/salt/prod"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-  salt_dev:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
-    path: "/srv/salt/dev"
-    branch: "dev"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"

pillars/roles/gitea/ytdownloader.sls

@@ -1,9 +0,0 @@
-git:
-  ytdownloader:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/ytdownloader.git"
-    path: "/root/scripts/ytdownloader"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"

pillars/roles/host/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.host.none
 
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- for role in roles %}
-    {%- for role in grains['roles'] %}
     {%- if 'pillars.roles.host.'+role in states %}
   - roles.host.{{ role }}
     {%- endif -%}
   {%- endfor -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/laradev/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.laradev.none
 
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- for role in roles %}
-    {%- for role in grains['roles'] %}
     {%- if 'pillars.roles.laradev.'+role in states %}
   - roles.laradev.{{ role }}
     {%- endif -%}
   {%- endfor -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/lxc/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.lxc.container_profiles
 
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- for role in roles %}
-    {%- for role in grains['roles'] %}
     {%- if 'pillars.roles.lxc.'+role in states %}
   - roles.lxc.{{ role }}
     {%- endif -%}
   {%- endfor -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/mount/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.mount.none
 
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- for role in roles %}
-    {%- for role in grains['roles'] %}
     {%- if 'pillars.roles.mount.'+role in states %}
   - roles.mount.{{ role }}
     {%- endif -%}
   {%- endfor -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/nginx/init.sls

@@ -1,9 +1,9 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.nginx.none
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- if 'portal' in roles -%}
-    {%- if 'portal' in grains['roles'] -%}
     {%- for state in states %}
       {%- if state.startswith("pillars.roles.nginx.") -%}
         {%- set role = state.split('.')[3] %}
@@ -11,11 +11,10 @@ include:
       {%- endif -%}
     {%- endfor -%}
   {%- else -%}
-      {%- for role in grains['roles'] %}
+    {%- for role in roles %}
       {%- if 'pillars.roles.nginx.'+role in states %}
   - roles.nginx.{{ role }}
       {%- endif -%}
     {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/router/init.sls

@@ -1,9 +1,9 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.router.none
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- if 'router' in roles -%}
-    {%- if 'router' in grains['roles'] -%}
     {%- for state in states %}
       {%- if state.startswith("pillars.roles.router.") -%}
         {%- set role = state.split('.')[3] %}
@@ -12,4 +12,3 @@ include:
     {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
-{%- endif -%}

pillars/roles/services/init.sls

@@ -1,9 +1,9 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.services.none
-{%- if grains['roles'] is defined -%}
+{%- if roles is not none -%}
-  {%- if grains['roles'] is not none -%}
+  {%- if 'icinga' in roles -%}
-    {%- if 'icinga' in grains['roles'] -%}
     {%- for state in states %}
       {%- if state.startswith("pillars.roles.services.") -%}
         {%- set role = state.split('.')[3] %}
@@ -12,4 +12,3 @@ include:
     {%- endfor -%}
   {%- endif -%}
 {%- endif -%}
-{%- endif -%}

pillars/servers/roles/server/archtest.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/arr.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - nrpe

pillars/servers/roles/server/atheos.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/authelia.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/baikal.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/base

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/bbs.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/ca.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/clark.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/cloud.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/emby.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - nrpe

pillars/servers/roles/server/git.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/gitea.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/host.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/host2.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/icinga.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/ipa.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/jackett.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - nrpe

pillars/servers/roles/server/lara.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/lidarr.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - nrpe

pillars/servers/roles/server/ombi.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - nrpe

pillars/servers/roles/server/pass.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/pkg.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/portal.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/project.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/radarr.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - nrpe

pillars/servers/roles/server/router.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - router
   - ssh

pillars/servers/roles/server/rtorrent.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - nrpe

pillars/servers/roles/server/salt.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/sonarr.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - nrpe

pillars/servers/roles/server/sql.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/ssh.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/sync.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/transmission.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - nrpe

pillars/servers/roles/server/tt.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/video.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

pillars/servers/roles/server/vpn.sls

@@ -1,4 +1,3 @@
-grains:
 roles:
   - server
   - ssh

states/grains/init.sls

@@ -1,14 +1,12 @@
 {# ensure that grains pillar exists -#}
-{%- if pillar['grains'] is defined -%}
+{%- if pillar['roles'] is defined %}
-  {%- if pillar['grains']['roles'] is defined %}
 set-roles:
   grains.present:
     - name: roles
     - force: true
-    - value: [{% for role in pillar['grains']['roles'] %}{{role}},{% endfor %}]
+    - value: [{% for role in pillar['roles'] %}{{role}},{% endfor %}]
 {% else %}
 set-roles:
   grains.absent:
     - name: roles
 {%- endif -%}
-{%- endif -%}

states/roles/maintain/glances/init.sls

@@ -1,7 +1,7 @@
 {%- set os=grains['os'] -%}
 
 {##check if server is portal##}
-{%- if 'portal' in pillar['grains']['roles'] -%}
+{%- if 'portal' in pillar['roles'] -%}
   {%- set portal = "portal" -%}
 {%- endif -%}
 nginx:

states/roles/maintain/icinga/conf.d/hosts.conf

@@ -7,10 +7,8 @@ object Host "{{server}}.actcur.com" {
   import "generic-host"
   address = "{{server}}.actcur.com"
 
-    {%- if role_data['grains'] is defined %}
+    {%- if role_data['roles'] is defined %}
-      {%- if role_data['grains']['roles'] is defined %}
+  vars.roles=[{%- for role in role_data['roles'] %}"{{role}}",{%- endfor -%}""];
-  vars.roles=[{%- for role in role_data['grains']['roles'] %}"{{role}}",{%- endfor -%}""];
-      {%- endif -%}
     {%- endif %}
     
 }

states/roles/maintain/nginx-proxy/init.sls

@@ -1,7 +1,7 @@
 {%- set os=grains['os'] -%}
 
 {##check if server is portal##}
-{%- if 'portal' in pillar['grains']['roles'] -%}
+{%- if 'portal' in pillar['roles'] -%}
   {%- set portal = "portal" -%}
 {%- endif -%}
 nginx:

states/systems/core/backup/init.sls

@@ -1,6 +1,6 @@
 
 
-{%- if 'backup' in pillar['grains']['roles'] -%}
+{%- if 'backup' in pillar['roles'] -%}
 {%- else -%}
   {##ensure that backup pillar exists##}
   {%- if pillar['backup'] is defined -%}

states/top.sls

@@ -14,8 +14,8 @@
     - systems.core.freeipa
   '*':
 {#- don't run update automatically on containers - updates will be triggered from their host -#}
-{%- if pillar['grains']['roles'] is defined -%}
+{%- if pillar['roles'] is defined -%}
-  {%- if 'lxc_container' not in pillar['grains']['roles'] %}
+  {%- if 'lxc_container' not in pillar['roles'] %}
     - update
   {%- endif -%}
 {%- endif %}
@@ -29,9 +29,9 @@
     - systems.core.mount
     - systems.core.git
     - systems.core.backup
-{%- if grains['roles'] is defined -%}
+{%- if pillar['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
+  {%- if pillar['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
+    {%- for role in pillar['roles'] %}
       {%- if 'roles.maintain.'+role in states %}
     - roles.maintain.{{role}}
       {%- endif -%}