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

Compare commits

base: actcur:512f1c30ab890b309755bc30d0d738cf14bc5bd0
Branches Tags
actcur:prod
actcur:dev
actcur:seer
actcur:nginx
actcur:bazarr
actcur:qual
actcur:matrix
actcur:fix_secrets
..
compare: actcur:7824725ff353ed51019029c5a045366bb6145833
Branches Tags
actcur:prod
actcur:dev
actcur:seer
actcur:nginx
actcur:bazarr
actcur:qual
actcur:matrix
actcur:fix_secrets

No commits in common. "512f1c30ab890b309755bc30d0d738cf14bc5bd0" and "7824725ff353ed51019029c5a045366bb6145833" have entirely different histories.
512f1c30ab ... 7824725ff3

43 changed files with 307 additions and 266 deletions
Show stats Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

6
states/grains/init.sls
View file

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

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

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

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

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

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

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

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

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

10
states/top.sls
View file

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