diff --git a/salt/soc/soc_soc.yaml b/salt/soc/soc_soc.yaml index 7153c7b5c..b0ecfdbc1 100644 --- a/salt/soc/soc_soc.yaml +++ b/salt/soc/soc_soc.yaml @@ -71,7 +71,7 @@ soc: - field: description label: Description - field: icon - label: Icon (Example - fa-shuttle-space) + label: "Icon (Example: fa-shuttle-space)" - field: links label: Links required: True diff --git a/setup/so-functions b/setup/so-functions index 5c4da25ba..fffa1a932 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -758,9 +758,9 @@ copy_salt_master_config() { #logCmd "cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service" fi 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 - logCmd "cp -Rv $temp_install_dir/salt/ $local_salt_dir/" + logCmd "cp -R $temp_install_dir/salt/ $local_salt_dir/" fi # 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 "touch $local_salt_dir/salt/zeek/policy/intel/intel.dat" else - logCmd "cp -Rv ../pillar/* $default_salt_dir/pillar/" - logCmd "cp -Rv ../salt/* $default_salt_dir/salt/" + logCmd "cp -R ../pillar/* $default_salt_dir/pillar/" + logCmd "cp -R ../salt/* $default_salt_dir/salt/" logCmd "mkdir -p $local_salt_dir/salt/zeek/policy/intel" logCmd "touch $local_salt_dir/salt/zeek/policy/intel/intel.dat" fi