actcur/salt
3
0
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity

switched to pillar roles wherever possible instead of grain roles

Browse source
This commit is contained in:
Actaeus Curabitur 2022-09-08 10:24:41 -05:00
parent d1d9db1feb
commit 57f6066c45
43 changed files with 266 additions and 307 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pillars/servers/roles/server/archtest.sls
View file

@ -1,6 +1,5 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
roles:
- server
- ssh
- nrpe
- saltminion

25
pillars/servers/roles/server/arr.sls
View file

@ -1,13 +1,12 @@
grains:
roles:
- server
- nrpe
- saltminion
- nginx-proxy
- arr
- sonarr
- radarr
- lidarr
- jackett
- ytdownloader
- podfox
roles:
- server
- nrpe
- saltminion
- nginx-proxy
- arr
- sonarr
- radarr
- lidarr
- jackett
- ytdownloader
- podfox

15
pillars/servers/roles/server/atheos.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- atheos
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- atheos
- nginx-proxy

15
pillars/servers/roles/server/authelia.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- authelia
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- authelia
- nginx-proxy

15
pillars/servers/roles/server/baikal.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- nginx-proxy
- baikal
roles:
- server
- ssh
- nrpe
- saltminion
- nginx-proxy
- baikal

11
pillars/servers/roles/server/base
View file

@ -1,6 +1,5 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
roles:
- server
- ssh
- nrpe
- saltminion

17
pillars/servers/roles/server/bbs.sls
View file

@ -1,9 +1,8 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- laradev
- bbs
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- laradev
- bbs
- nginx-proxy

13
pillars/servers/roles/server/ca.sls
View file

@ -1,7 +1,6 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- ca
roles:
- server
- ssh
- nrpe
- saltminion
- ca

17
pillars/servers/roles/server/clark.sls
View file

@ -1,9 +1,8 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- laradev
- clark-family
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- laradev
- clark-family
- nginx-proxy

15
pillars/servers/roles/server/cloud.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- nextcloud
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- nextcloud
- nginx-proxy

13
pillars/servers/roles/server/emby.sls
View file

@ -1,7 +1,6 @@
grains:
roles:
- server
- nrpe
- saltminion
- nginx-proxy
- emby
roles:
- server
- nrpe
- saltminion
- nginx-proxy
- emby

15
pillars/servers/roles/server/git.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- git
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- git
- nginx-proxy

15
pillars/servers/roles/server/gitea.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- gitea
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- gitea
- nginx-proxy

17
pillars/servers/roles/server/host.sls
View file

@ -1,9 +1,8 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- backup
- host
- host2
roles:
- server
- ssh
- nrpe
- saltminion
- backup
- host
- host2

17
pillars/servers/roles/server/host2.sls
View file

@ -1,9 +1,8 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- backup
- host
- host2
roles:
- server
- ssh
- nrpe
- saltminion
- backup
- host
- host2

15
pillars/servers/roles/server/icinga.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- icinga
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- icinga
- nginx-proxy

13
pillars/servers/roles/server/ipa.sls
View file

@ -1,7 +1,6 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- freeipa-server
roles:
- server
- ssh
- nrpe
- saltminion
- freeipa-server

13
pillars/servers/roles/server/jackett.sls
View file

@ -1,7 +1,6 @@
grains:
roles:
- server
- nrpe
- saltminion
- lxc_container
- jackett
roles:
- server
- nrpe
- saltminion
- lxc_container
- jackett

13
pillars/servers/roles/server/lara.sls
View file

@ -1,7 +1,6 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- laradev
roles:
- server
- ssh
- nrpe
- saltminion
- laradev

13
pillars/servers/roles/server/lidarr.sls
View file

@ -1,7 +1,6 @@
grains:
roles:
- server
- nrpe
- saltminion
- lxc_container
- lidarr
roles:
- server
- nrpe
- saltminion
- lxc_container
- lidarr

13
pillars/servers/roles/server/ombi.sls
View file

@ -1,7 +1,6 @@
grains:
roles:
- server
- nrpe
- saltminion
- nginx-proxy
- ombi
roles:
- server
- nrpe
- saltminion
- nginx-proxy
- ombi

15
pillars/servers/roles/server/pass.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- nginx-proxy
- pass
roles:
- server
- ssh
- nrpe
- saltminion
- nginx-proxy
- pass

17
pillars/servers/roles/server/pkg.sls
View file

@ -1,9 +1,8 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- pkg-cache
- aurutils
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- pkg-cache
- aurutils
- nginx-proxy

15
pillars/servers/roles/server/portal.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- portal
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- portal
- nginx-proxy

15
pillars/servers/roles/server/project.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- openproject
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- openproject
- nginx-proxy

13
pillars/servers/roles/server/radarr.sls
View file

@ -1,7 +1,6 @@
grains:
roles:
- server
- nrpe
- saltminion
- lxc_container
- radarr
roles:
- server
- nrpe
- saltminion
- lxc_container
- radarr

7
pillars/servers/roles/server/router.sls
View file

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

15
pillars/servers/roles/server/rtorrent.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- nrpe
- saltminion
- nginx-proxy
- windscribe
- rtorrent
roles:
- server
- nrpe
- saltminion
- nginx-proxy
- windscribe
- rtorrent

17
pillars/servers/roles/server/salt.sls
View file

@ -1,9 +1,8 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- saltmaster
- mirrorlist
- certbot
roles:
- server
- ssh
- nrpe
- saltminion
- saltmaster
- mirrorlist
- certbot

15
pillars/servers/roles/server/sonarr.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- nrpe
- saltminion
- lxc_container
- sonarr
- ytdownloader
roles:
- server
- nrpe
- saltminion
- lxc_container
- sonarr
- ytdownloader

13
pillars/servers/roles/server/sql.sls
View file

@ -1,7 +1,6 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- mysql
roles:
- server
- ssh
- nrpe
- saltminion
- mysql

13
pillars/servers/roles/server/ssh.sls
View file

@ -1,7 +1,6 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- sshserver
roles:
- server
- ssh
- nrpe
- saltminion
- sshserver

15
pillars/servers/roles/server/sync.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- sync
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- sync
- nginx-proxy

15
pillars/servers/roles/server/transmission.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- nrpe
- saltminion
- nginx-proxy
- windscribe
- transmission
roles:
- server
- nrpe
- saltminion
- nginx-proxy
- windscribe
- transmission

15
pillars/servers/roles/server/tt.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- ttrss
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- ttrss
- nginx-proxy

17
pillars/servers/roles/server/video.sls
View file

@ -1,9 +1,8 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- lxc
- video
- nginx-proxy
roles:
- server
- ssh
- nrpe
- saltminion
- lxc
- video
- nginx-proxy

15
pillars/servers/roles/server/vpn.sls
View file

@ -1,8 +1,7 @@
grains:
roles:
- server
- ssh
- nrpe
- saltminion
- vpnserver
- ca-cert
roles:
- server
- ssh
- nrpe
- saltminion
- vpnserver
- ca-cert

8
states/grains/init.sls
View file

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

2
states/roles/maintain/glances/init.sls
View file

@ -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:

6
states/roles/maintain/icinga/conf.d/hosts.conf
View file

@ -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['grains']['roles'] is defined %}
vars.roles=[{%- for role in role_data['grains']['roles'] %}"{{role}}",{%- endfor -%}""];
{%- endif -%}
{%- if role_data['roles'] is defined %}
vars.roles=[{%- for role in role_data['roles'] %}"{{role}}",{%- endfor -%}""];
{%- endif %}
}

2
states/roles/maintain/nginx-proxy/init.sls
View file

@ -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:

2
states/systems/core/backup/init.sls
View file

@ -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 -%}

10
states/top.sls
View file

@ -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 'lxc_container' not in pillar['grains']['roles'] %}
{%- if pillar['roles'] is defined -%}
{%- 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 grains['roles'] is not none -%}
{%- for role in grains['roles'] %}
{%- if pillar['roles'] is defined -%}
{%- if pillar['roles'] is not none -%}
{%- for role in pillar['roles'] %}
{%- if 'roles.maintain.'+role in states %}
- roles.maintain.{{role}}
{%- endif -%}