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

Fleet standaline custom fqdn fixes

Browse Source
This commit is contained in:
Josh Brower
2020-06-06 10:03:25 -04:00
parent 0890171527
commit 33f21c05f7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/fleet/event_gen-packages.sls
View File

@@ -5,9 +5,9 @@
{% set CUSTOM_FLEET_HOSTNAME = salt['pillar.get']('static:fleet_custom_hostname', None) %} {% set CUSTOM_FLEET_HOSTNAME = salt['pillar.get']('static:fleet_custom_hostname', None) %}
{% if CUSTOM_FLEET_HOSTNAME != None %} {% if CUSTOM_FLEET_HOSTNAME != None %}
{% set HOSTNAME = {{ CUSTOM_FLEET_HOSTNAME }} %} {% set HOSTNAME = CUSTOM_FLEET_HOSTNAME %}
{% else %} {% else %}
{% set HOSTNAME = {{ grains.host }} %} {% set HOSTNAME = grains.host %}
{% endif %} {% endif %}
so/fleet: so/fleet:

2
setup/so-setup
View File

@@ -499,7 +499,7 @@ fi
if [[ $is_fleet_standalone && $FLEETCUSTOMHOSTNAME != '' ]]; then if [[ $is_fleet_standalone && $FLEETCUSTOMHOSTNAME != '' ]]; then
set_progress_str 73 "$(print_salt_state_apply 'fleet.event_update-custom-hostname')" set_progress_str 73 "$(print_salt_state_apply 'fleet.event_update-custom-hostname')"
pillar_override="{"static":{"fleet_custom_hostname":"$FLEETCUSTOMHOSTNAME"}}" pillar_override=='"{"static":{"fleet_custom_hostname":"'$FLEETCUSTOMHOSTNAME'"}}"'
salt-call state.apply -l info fleet.event_update-custom-hostname pillar=$pillar_override >> $setup_log 2>&1 salt-call state.apply -l info fleet.event_update-custom-hostname pillar=$pillar_override >> $setup_log 2>&1
fi fi