Merge pull request #214 from ripienaar/207.2

(#207) fix path to shim config
choria-io · Dec 29, 2020 · eb9ec38 · eb9ec38
2 parents 45db61a + e501140
commit eb9ec38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/data/common.yaml b/data/common.yaml
@@ -5,7 +5,7 @@ choria::server_config:
   plugin.rpcaudit.logfile: "/var/log/choria-audit.log"
   plugin.yaml: "/etc/puppetlabs/mcollective/generated-facts.yaml"
   plugin.choria.agent_provider.mcorpc.agent_shim: "/usr/bin/choria_mcollective_agent_compat.rb"
-  plugin.choria.agent_provider.mcorpc.config: "/etc/puppetlabs/mcollective/choria-shim.cfg"
+  plugin.choria.agent_provider.mcorpc.config: "/etc/choria/choria-shim.cfg"
   plugin.choria.agent_provider.mcorpc.libdir: "/opt/puppetlabs/mcollective/plugins"
   plugin.choria.machine.store: "/etc/choria/machine"
   plugin.scout.overrides: "/etc/choria/overrides.json"

diff --git a/data/os/FreeBSD.yaml b/data/os/FreeBSD.yaml
@@ -3,7 +3,7 @@ choria::server_config:
   classesfile: "/var/puppet/state/classes.txt"
   plugin.yaml: "/usr/local/etc/mcollective/generated-facts.yaml"
   plugin.choria.agent_provider.mcorpc.agent_shim: "/usr/local/bin/choria_mcollective_agent_compat.rb"
-  plugin.choria.agent_provider.mcorpc.config: "/usr/local/etc/mcollective/choria-shim.cfg"
+  plugin.choria.agent_provider.mcorpc.config: "/usr/local/etc/choria/choria-shim.cfg"
   plugin.choria.agent_provider.mcorpc.libdir: "/usr/local/share"
   plugin.choria.machine.store: "/usr/local/etc/choria/machine"
   plugin.scout.overrides: "/usr/local/etc/choria/overrides.json"