From 66bfffb9302a819c4260a763108caa18bc1649d2 Mon Sep 17 00:00:00 2001 From: Actaeus Curabitur <actcur@actcur.com> Date: Thu, 8 Sep 2022 06:25:50 -0500 Subject: [PATCH] updated saltmaster git --- pillars/roles/git/saltmaster.sls | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pillars/roles/git/saltmaster.sls b/pillars/roles/git/saltmaster.sls index 0b4f612..89ca9da 100644 --- a/pillars/roles/git/saltmaster.sls +++ b/pillars/roles/git/saltmaster.sls @@ -6,19 +6,13 @@ branches: {%- endfor %} git: - salt: +{%- for branch in branches %} + salt_{{branch}}: repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git" - path: "/srv/salt/prod" - branch: "master" + path: "/srv/salt/{{branch}}" + branch: "{{branch}}" 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 + force: {{ "True" if branch == "prod" else "false" }} email: "actcur@actcur.com" name: "Actaeus Curabitur" +{%- endfor %}