diff --git a/base/hostconfig/init.sls b/base/hostconfig/init.sls index 093772c..474f2d5 100644 --- a/base/hostconfig/init.sls +++ b/base/hostconfig/init.sls @@ -1,5 +1,7 @@ -{% set canonical_name = salt['grains.get']('host') | regex_replace('[0-9]', '', ignorecase=True) -%} -{% include './' + canonical_name + '.sls' ignore missing %} +{% if salt['grains.get']('host') | regex_match('.*[0-9][0-9]') %} + {% set canonical_name = salt['grains.get']('host') | regex_replace('[0-9]', '', ignorecase=True) %} + {% include './' + canonical_name + '.sls' ignore missing %} +{% endif %} {% include './' + salt['grains.get']('host') + '.sls' ignore missing %} diff --git a/base/hostconfig/truhe.sls b/base/hostconfig/truhe.sls index c6e4e0f..1dbaa96 100644 --- a/base/hostconfig/truhe.sls +++ b/base/hostconfig/truhe.sls @@ -75,10 +75,9 @@ haproxy: name: www-http bind: - "*:80" - - "*:443 ssl crt /etc/pki/chain ca-file /etc/pki/intca.crt" - default_backend: auto + default_backend: rompr acls: - - host_rompr hdr_beg(host) -i truhe. + - host_truhe hdr_beg(host) -i truhe. use_backends: - rompr if host_truhe backends: