From e4375a656851dc002c3cf3f7c3c5cbea2efb789c Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 27 Apr 2023 15:30:59 -0400 Subject: [PATCH] regex for hostgroups --- salt/firewall/soc_firewall.yaml | 1 + salt/top.sls | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/salt/firewall/soc_firewall.yaml b/salt/firewall/soc_firewall.yaml index b1faed41c..4eb297c78 100644 --- a/salt/firewall/soc_firewall.yaml +++ b/salt/firewall/soc_firewall.yaml @@ -37,6 +37,7 @@ firewall: description: List of IP or CIDR blocks to allow to this hostgroup. helpLink: firewall.html advanced: True + multiline: True regex: ^(([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?)?$ regexFailureMessage: You must enter a valid IP address or CIDR. customhostgroup2: *customhostgroupsettings diff --git a/salt/top.sls b/salt/top.sls index 372c64115..0459a6da4 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -74,7 +74,6 @@ base: - telegraf - influxdb - soc - - firewall.soc - kratos - firewall - idstools @@ -119,7 +118,6 @@ base: - telegraf - influxdb - soc - - firewall.soc - kratos - firewall - manager @@ -162,7 +160,6 @@ base: - telegraf - influxdb - soc - - firewall.soc - kratos - firewall - idstools @@ -226,7 +223,6 @@ base: - telegraf - influxdb - soc - - firewall.soc - kratos - firewall - manager @@ -296,7 +292,6 @@ base: - telegraf - influxdb - soc - - firewall.soc - kratos - firewall - idstools