diff --git a/batman_adv/exporter.sls b/batman_adv/exporter.sls index 05d1f2efad9d978aec00226e48c5fb6f2e91eec9..15a4e8ab93f411f08b6d8a5be3aa9feecbc51524 100644 --- a/batman_adv/exporter.sls +++ b/batman_adv/exporter.sls @@ -10,7 +10,7 @@ /etc/systemd/system/prometheus-batadv-txtexport.timer: file.managed: - - source: + - source: - salt://batman_adv/files/prometheus-batadv-txtexport.timer.{{ grains['oscodename'] }} - salt://batman_adv/files/prometheus-batadv-txtexport.timer - mode: '0644' diff --git a/kernel/sysctl.sls b/kernel/sysctl.sls index 83ffb8f1ece030dbf01f1a4a72313712cfeef470..3abe5776a0d1137e2a01002bbfe344234a20d003 100644 --- a/kernel/sysctl.sls +++ b/kernel/sysctl.sls @@ -69,7 +69,7 @@ net.ipv4.neigh.default.gc_thresh3: net.ipv6.neigh.default.gc_thresh1: sysctl.present: - - value: 2048 + - value: 2048 - config: {{ sysctld }}/neigh.conf net.ipv6.neigh.default.gc_thresh2: @@ -92,7 +92,7 @@ net.ipv6.conf.all.forwarding: sysctl.present: - value: 1 - config: {{ sysctld }}/forward.conf - + # Increase the r/w-buffer-space allocatable #core @@ -149,8 +149,8 @@ net.ipv6.conf.all.keep_addr_on_down: sysctl.present: - value: 1 - config: {{ sysctld }}/keep_addr_on_down.conf - - + + ## IPv4 tuning #Prevent SYN attack, enable SYNcookies (they will kick-in when the max_syn_backlog reached) @@ -216,7 +216,7 @@ net.ipv6.route.max_size: sysctl.present: - value: 8388608 - config: {{ sysctld }}/forward.conf - + # Accept Redirects; default = 0 net.ipv6.conf.default.accept_redirects: sysctl.present: diff --git a/network/domains-batman.sls b/network/domains-batman.sls index f36118122d09340a7c9e224ccd2d540de0edd13a..ec3af79eae108da90700e19830e984c4334b1343 100644 --- a/network/domains-batman.sls +++ b/network/domains-batman.sls @@ -1,4 +1,4 @@ -{% set transport_interface = salt['pillar.get']('ferm:transport_interface', 'ens14') %} +{% set transport_interface = salt['pillar.get']('ferm:transport_interface', 'ens14') %} /etc/network/interfaces.d/{{ transport_interface }}: file.managed: - source: salt://network/files/transport_interface.j2 diff --git a/nginx/vhosts.sls b/nginx/vhosts.sls index 45a22a072b56ef9d013044f1d75f1f40c5de0ab7..0c4ec51f2f14448e3940be9d8784eea0f56ee9b3 100644 --- a/nginx/vhosts.sls +++ b/nginx/vhosts.sls @@ -7,7 +7,7 @@ /etc/nginx/sites-available/{{ name }}.conf: file.managed: - - source: + - source: {%- if cert_exists %} - salt://nginx/files/sites/{{ name }}.conf.j2 - salt://nginx/files/sites/default-https.conf.j2