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

changed how environment is determined - it will now automatically switch between dev/prod when one is explicitly called

Browse source
This commit is contained in:
Actaeus Curabitur 2022-09-01 08:08:02 -05:00
parent 1fe8b4313e
commit a2714e4179
40 changed files with 2 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pillars/servers/env/init.sls vendored
View file

@ -1,2 +0,0 @@
include:
- servers.env.server.{{ grains['host'] }}

1
pillars/servers/env/server/archtest.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/arr.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/atheos.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/authelia.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/baikal.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/base vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/bbs.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/ca.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/clark.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/cloud.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/emby.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/git.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/gitea.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/host.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/host2.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/icinga.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/ipa.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/jackett.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/lara.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/lidarr.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/ombi.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/pass.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/pkg.sls vendored
View file

@ -1 +0,0 @@
env: dev

1
pillars/servers/env/server/portal.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/project.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/radarr.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/router.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/rtorrent.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/salt.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/sonarr.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/sql.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/ssh.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/sync.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/transmission.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/tt.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/video.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/vpn.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/mkserver.sh
View file

@ -1,4 +1,3 @@
#!/bin/bash
cp env/server/base env/server/$1.sls
cp roles/server/base roles/server/$1.sls

8
states/roles/maintain/saltminion/minion
View file

@ -347,12 +347,8 @@ master: salt.actcur.com
# when running states, but the environment can be isolated on the minion side
# by statically setting it. Remember that the recommended way to manage
# environments is to isolate via the top file.
{%- set env="dev" -%}
{%- if pillar['env'] is defined -%}
{%- set env=pillar['env'] -%}
{%- endif %}
saltenv: {{ env }}
pillarenv: {{ env }}
saltenv: {{ saltenv }}
pillarenv: {{ saltenv }}
#
# If using the local file directory, then the state top file name needs to be
# defined, by default this is top.sls.