From 78b496a689ed13130cf8c13434226178fb932bdb Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 12 Oct 2022 16:03:44 -0400 Subject: [PATCH] fix mine_functions.conf --- .../minion.d/{mine_functions.conf => mine_functions.conf.jinja} | 0 salt/salt/minion.sls | 2 +- setup/so-functions | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename salt/salt/etc/minion.d/{mine_functions.conf => mine_functions.conf.jinja} (100%) diff --git a/salt/salt/etc/minion.d/mine_functions.conf b/salt/salt/etc/minion.d/mine_functions.conf.jinja similarity index 100% rename from salt/salt/etc/minion.d/mine_functions.conf rename to salt/salt/etc/minion.d/mine_functions.conf.jinja diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls index 4e9f40cb3..50bb865df 100644 --- a/salt/salt/minion.sls +++ b/salt/salt/minion.sls @@ -97,7 +97,7 @@ salt_minion_service_unit_file: mine_functions: file.managed: - name: /etc/salt/minion.d/mine_functions.conf - - source: salt://salt/etc/minion.d/mine_functions.conf + - source: salt://salt/etc/minion.d/mine_functions.conf.jinja - template: jinja - defaults: GLOBALS: {{ GLOBALS }} diff --git a/setup/so-functions b/setup/so-functions index 1d0645791..76fcca2ed 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -614,7 +614,7 @@ configure_minion() { "log_file: /opt/so/log/salt/minion" >> "$minion_config" cp -f ../salt/salt/etc/minion.d/mine_functions.conf /etc/salt/minion.d/mine_functions.conf - sed -i "s/{{ pillar.host.mainint }}/$MAININT/" /etc/salt/minion.d/mine_functions.conf + sed -i "s/{{ GLOBALS.main_interface }}/$MAININT/" /etc/salt/minion.d/mine_functions.conf { systemctl restart salt-minion;