diff --git a/base/hardware/init.sls b/base/hardware/init.sls index 267407f..30b7b19 100644 --- a/base/hardware/init.sls +++ b/base/hardware/init.sls @@ -1,4 +1,3 @@ include: - base.hardware.{{ grains.get('hardware') | lower }} - diff --git a/base/hardware/unknown.sls b/base/hardware/unknown.sls new file mode 100644 index 0000000..4147e0c --- /dev/null +++ b/base/hardware/unknown.sls @@ -0,0 +1 @@ +#just a placeholder \ No newline at end of file diff --git a/base/hostconfig/auto02.sls b/base/hostconfig/auto02.sls index e477e8c..e2b6148 100644 --- a/base/hostconfig/auto02.sls +++ b/base/hostconfig/auto02.sls @@ -146,7 +146,7 @@ haproxy: name: www-http bind: - "*:80" - - "*:443 ssl crt /etc/pki/chain ca-file /etc/pki/intca.crt" + #- "*:443 ssl crt /etc/pki/chain ca-file /etc/pki/intca.crt" default_backend: auto acls: - host_auto hdr_beg(host) -i auto. diff --git a/base/hostconfig/init.sls b/base/hostconfig/init.sls index 7f7cbce..28af562 100644 --- a/base/hostconfig/init.sls +++ b/base/hostconfig/init.sls @@ -1,5 +1,5 @@ include: - - base.hostconfig.{{ grains.get('nodename') | regex_replace('[0-9]', '', ignorecase=True) }} + #- base.hostconfig.{{ grains.get('nodename') | regex_replace('[0-9]', '', ignorecase=True) }} - base.hostconfig.{{ grains.get('nodename') }} diff --git a/base/hostconfig/yori.sls b/base/hostconfig/yori.sls new file mode 100644 index 0000000..f1cc739 --- /dev/null +++ b/base/hostconfig/yori.sls @@ -0,0 +1,2 @@ +os: + release: sid diff --git a/base/init.sls b/base/init.sls index c2d3840..96296e6 100644 --- a/base/init.sls +++ b/base/init.sls @@ -4,7 +4,7 @@ include: - base.services - - base.hardware + #- base.hardware - base.hostconfig - base.sysctl - saltmine