Log In
heroes
/
salt
Clone
Source Code
GIT
Source
Stats
Overview
Files
Commits
Branches
Forks
Releases
045d11
Merge branch 'haproxy' into 'production'
Merged and Committed by Christian Boltz
a year ago
raw
patch
tree
parents
6bb77095de647b00d7220064a7e289abd1c3acfb
ec754bd6fa5752e97ffa328192c03d8f084ee540
23 files changed.
1184 lines added
.
6 lines removed
.
pillar/FORMULAS.yaml
file modified
+1
-0
pillar/cluster/anna_elsa/backends.sls
file added
+249
pillar/cluster/anna_elsa/init.sls
file added
+125
pillar/cluster/anna_elsa/macros.jinja
file added
+44
pillar/cluster/anna_elsa/map.jinja
file added
+15
pillar/cluster/anna_elsa/services_http_ext.sls
file added
+225
pillar/cluster/anna_elsa/services_http_int.sls
file added
+51
pillar/common/haproxy/defaults.sls
file added
+24
pillar/common/haproxy/global.sls
file added
+35
pillar/common/haproxy/init.sls
file added
+3
pillar/common/init.sls
pillar/common.sls
file renamed
+0
-0
pillar/id/anna_infra_opensuse_org.sls
file modified
+3
-0
pillar/id/elsa_infra_opensuse_org.sls
file modified
+3
-0
pillar/role/proxy.sls
file modified
+3
-2
pillar/secrets/role/proxy.sls
file modified
+139
-0
salt/profile/proxy/files/etc/haproxy/errorfiles/403.html.http
file added
+20
salt/profile/proxy/files/etc/haproxy/errorfiles/conncheck.txt.http
file added
+6
salt/profile/proxy/files/etc/haproxy/errorfiles/deprecated.html.http
file added
+79
salt/profile/proxy/files/etc/haproxy/errorfiles/downtime.html.http
file added
+80
salt/profile/proxy/files/etc/haproxy/errorfiles/downtime.xml.http
file added
+11
salt/profile/proxy/files/etc/haproxy/errorfiles/fourohfour.html.http
file added
+17
salt/profile/proxy/files/etc/haproxy/errorfiles/security.txt.http
file added
+10
salt/profile/proxy/haproxy.sls
file modified
+41
-4
Merge branch 'haproxy' into 'production' Saltify HAProxy See merge request infra/salt!618
pillar/FORMULAS.yaml
file modified
+1
-0
pillar/cluster/anna_elsa/backends.sls
file added
+249
pillar/cluster/anna_elsa/init.sls
file added
+125
pillar/cluster/anna_elsa/macros.jinja
file added
+44
pillar/cluster/anna_elsa/map.jinja
file added
+15
pillar/cluster/anna_elsa/services_http_ext.sls
file added
+225
pillar/cluster/anna_elsa/services_http_int.sls
file added
+51
pillar/common/haproxy/defaults.sls
file added
+24
pillar/common/haproxy/global.sls
file added
+35
pillar/common/haproxy/init.sls
file added
+3
pillar/common/init.sls
pillar/common.sls
file renamed
file was renamed with no change to the file
pillar/id/anna_infra_opensuse_org.sls
file modified
+3
-0
pillar/id/elsa_infra_opensuse_org.sls
file modified
+3
-0
pillar/role/proxy.sls
file modified
+3
-2
pillar/secrets/role/proxy.sls
file modified
+139
-0
salt/profile/proxy/files/etc/haproxy/errorfiles/403.html.http
file added
+20
salt/profile/proxy/files/etc/haproxy/errorfiles/conncheck.txt.http
file added
+6
salt/profile/proxy/files/etc/haproxy/errorfiles/deprecated.html.http
file added
+79
salt/profile/proxy/files/etc/haproxy/errorfiles/downtime.html.http
file added
+80
salt/profile/proxy/files/etc/haproxy/errorfiles/downtime.xml.http
file added
+11
salt/profile/proxy/files/etc/haproxy/errorfiles/fourohfour.html.http
file added
+17
salt/profile/proxy/files/etc/haproxy/errorfiles/security.txt.http
file added
+10
salt/profile/proxy/haproxy.sls
file modified
+41
-4