From 4c9d172721aefd621e40e7ad58ce02c58afcae36 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 21 Jul 2023 16:21:18 -0400 Subject: [PATCH] sorange to range --- salt/docker/docker.map.jinja | 2 +- salt/firewall/iptables.jinja | 2 +- salt/firewall/map.jinja | 2 +- salt/playbook/config.sls | 4 ++-- salt/soc/defaults.map.jinja | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/salt/docker/docker.map.jinja b/salt/docker/docker.map.jinja index 299977d6e..61416f7a4 100644 --- a/salt/docker/docker.map.jinja +++ b/salt/docker/docker.map.jinja @@ -1,6 +1,6 @@ {% import_yaml 'docker/defaults.yaml' as DOCKERDEFAULTS %} {% set DOCKER = salt['pillar.get']('docker', DOCKERDEFAULTS.docker, merge=True) %} -{% set RANGESPLIT = DOCKER.sorange.split('.') %} +{% set RANGESPLIT = DOCKER.range.split('.') %} {% set FIRSTTHREE = RANGESPLIT[0] ~ '.' ~ RANGESPLIT[1] ~ '.' ~ RANGESPLIT[2] ~ '.' %} {% for container, vals in DOCKER.containers.items() %} diff --git a/salt/firewall/iptables.jinja b/salt/firewall/iptables.jinja index 6e91a9b93..c15a54e46 100644 --- a/salt/firewall/iptables.jinja +++ b/salt/firewall/iptables.jinja @@ -52,7 +52,7 @@ :DOCKER - [0:0] -A PREROUTING -m addrtype --dst-type LOCAL -j DOCKER -A OUTPUT ! -d 127.0.0.0/8 -m addrtype --dst-type LOCAL -j DOCKER --A POSTROUTING -s {{DOCKER.sorange}} ! -o sobridge -j MASQUERADE +-A POSTROUTING -s {{DOCKER.range}} ! -o sobridge -j MASQUERADE {%- for rule in PR %} {{ rule }} {%- endfor %} diff --git a/salt/firewall/map.jinja b/salt/firewall/map.jinja index 99296e0ab..74b3a66be 100644 --- a/salt/firewall/map.jinja +++ b/salt/firewall/map.jinja @@ -5,7 +5,7 @@ {# add our ip to self #} {% do FIREWALL_DEFAULT.firewall.hostgroups.self.append(GLOBALS.node_ip) %} {# add dockernet range #} -{% do FIREWALL_DEFAULT.firewall.hostgroups.dockernet.append(DOCKER.sorange) %} +{% do FIREWALL_DEFAULT.firewall.hostgroups.dockernet.append(DOCKER.range) %} {% if GLOBALS.role == 'so-idh' %} {% from 'idh/opencanary_config.map.jinja' import IDH_PORTGROUPS %} diff --git a/salt/playbook/config.sls b/salt/playbook/config.sls index 9c8444a56..7d37f8873 100644 --- a/salt/playbook/config.sls +++ b/salt/playbook/config.sls @@ -18,7 +18,7 @@ create_playbookdbuser: mysql_user.present: - name: playbookdbuser - password: {{ PLAYBOOKPASS }} - - host: "{{ DOCKER.sorange.split('/')[0] }}/255.255.255.0" + - host: "{{ DOCKER.range.split('/')[0] }}/255.255.255.0" - connection_host: {{ GLOBALS.manager }} - connection_port: 3306 - connection_user: root @@ -27,7 +27,7 @@ create_playbookdbuser: query_playbookdbuser_grants: mysql_query.run: - database: playbook - - query: "GRANT ALL ON playbook.* TO 'playbookdbuser'@'{{ DOCKER.sorange.split('/')[0] }}/255.255.255.0';" + - query: "GRANT ALL ON playbook.* TO 'playbookdbuser'@'{{ DOCKER.range.split('/')[0] }}/255.255.255.0';" - connection_host: {{ GLOBALS.manager }} - connection_port: 3306 - connection_user: root diff --git a/salt/soc/defaults.map.jinja b/salt/soc/defaults.map.jinja index d816752c0..7720e7027 100644 --- a/salt/soc/defaults.map.jinja +++ b/salt/soc/defaults.map.jinja @@ -30,7 +30,7 @@ {% endif %} {% endfor %} -{% do SOCDEFAULTS.soc.config.server.modules.statickeyauth.update({'anonymousCidr': DOCKER.sorange, 'apiKey': pillar.sensoroni.config.sensoronikey}) %} +{% do SOCDEFAULTS.soc.config.server.modules.statickeyauth.update({'anonymousCidr': DOCKER.range, 'apiKey': pillar.sensoroni.config.sensoronikey}) %} {% do SOCDEFAULTS.soc.config.server.client.case.update({'analyzerNodeId': GLOBALS.hostname}) %}