CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-08 18:22:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14359 from Security-Onion-Solutions/jertel/wip

Browse Source 
Improve label
This commit is contained in:
Jason Ertel
2025-03-07 08:44:12 -05:00
committed by GitHub
parent 53ab7a223d 2af05b9a23
commit 4893eda4fe
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/soc/soc_soc.yaml
View File

@@ -71,7 +71,7 @@ soc:
- field: description - field: description
label: Description label: Description
- field: icon - field: icon
label: Icon (Example - fa-shuttle-space) label: "Icon (Example: fa-shuttle-space)"
- field: links - field: links
label: Links label: Links
required: True required: True

8
setup/so-functions
View File

@@ -758,9 +758,9 @@ copy_salt_master_config() {
#logCmd "cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service" #logCmd "cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service"
fi fi
info "Copying pillar and salt files in $temp_install_dir to $local_salt_dir" info "Copying pillar and salt files in $temp_install_dir to $local_salt_dir"
logCmd "cp -Rv $temp_install_dir/pillar/ $local_salt_dir/" logCmd "cp -R $temp_install_dir/pillar/ $local_salt_dir/"
if [ -d "$temp_install_dir"/salt ] ; then if [ -d "$temp_install_dir"/salt ] ; then
logCmd "cp -Rv $temp_install_dir/salt/ $local_salt_dir/" logCmd "cp -R $temp_install_dir/salt/ $local_salt_dir/"
fi fi
# Restart the service so it picks up the changes # Restart the service so it picks up the changes
@@ -2107,8 +2107,8 @@ setup_salt_master_dirs() {
logCmd "mkdir -p $local_salt_dir/salt/zeek/policy/intel" logCmd "mkdir -p $local_salt_dir/salt/zeek/policy/intel"
logCmd "touch $local_salt_dir/salt/zeek/policy/intel/intel.dat" logCmd "touch $local_salt_dir/salt/zeek/policy/intel/intel.dat"
else else
logCmd "cp -Rv ../pillar/* $default_salt_dir/pillar/" logCmd "cp -R ../pillar/* $default_salt_dir/pillar/"
logCmd "cp -Rv ../salt/* $default_salt_dir/salt/" logCmd "cp -R ../salt/* $default_salt_dir/salt/"
logCmd "mkdir -p $local_salt_dir/salt/zeek/policy/intel" logCmd "mkdir -p $local_salt_dir/salt/zeek/policy/intel"
logCmd "touch $local_salt_dir/salt/zeek/policy/intel/intel.dat" logCmd "touch $local_salt_dir/salt/zeek/policy/intel/intel.dat"
fi fi