diff --git a/pillar/data/addtotab.sh b/pillar/data/addtotab.sh index 8e5a166cc..619f1722f 100644 --- a/pillar/data/addtotab.sh +++ b/pillar/data/addtotab.sh @@ -19,8 +19,12 @@ if [ ! -d $local_salt_dir/pillar/data/ ]; then mkdir -p $local_salt_dir/pillar/data/ fi +# Create the template if [ ! -f $local_salt_dir/pillar/data/$TYPE.sls ]; then - cp $default_salt_dir/pillar/data/$TYPE.sls $local_salt_dir/pillar/data/$TYPE.sls + printf '%s\n'\ + "$TYPE:"\ + "" > "$local_salt_dir/pillar/data"/$TYPE.sls + echo "Added $TYPE Template" fi echo "Seeing if this host is already in here. If so delete it" diff --git a/pillar/data/evaltab.sls b/pillar/data/evaltab.sls deleted file mode 100644 index 496542c18..000000000 --- a/pillar/data/evaltab.sls +++ /dev/null @@ -1 +0,0 @@ -evaltab: diff --git a/pillar/data/mastersearchtab.sls b/pillar/data/mastersearchtab.sls deleted file mode 100644 index 7e48930ab..000000000 --- a/pillar/data/mastersearchtab.sls +++ /dev/null @@ -1 +0,0 @@ -mastersearchtab: diff --git a/pillar/data/mastertab.sls b/pillar/data/mastertab.sls deleted file mode 100644 index daf832a5f..000000000 --- a/pillar/data/mastertab.sls +++ /dev/null @@ -1 +0,0 @@ -mastertab: diff --git a/pillar/data/nodestab.sls b/pillar/data/nodestab.sls deleted file mode 100644 index b30173cca..000000000 --- a/pillar/data/nodestab.sls +++ /dev/null @@ -1 +0,0 @@ -nodestab: diff --git a/pillar/data/sensorstab.sls b/pillar/data/sensorstab.sls deleted file mode 100644 index 60032a938..000000000 --- a/pillar/data/sensorstab.sls +++ /dev/null @@ -1 +0,0 @@ -sensorstab: diff --git a/salt/suricata/init.sls b/salt/suricata/init.sls index 39f419ad0..cc6c6f8a3 100644 --- a/salt/suricata/init.sls +++ b/salt/suricata/init.sls @@ -55,6 +55,11 @@ surilogdir: - user: 940 - group: 939 +ruleslink: + file.symlink: + - name: /opt/so/saltstack/local/salt/suricata/rules + - target: /opt/so/rules/nids + surirulesync: file.recurse: - name: /opt/so/conf/suricata/rules/