From f652c2b35304f165af0afcd45d04f538d78f31c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Fri, 10 Jan 2020 13:20:50 -1000
Subject: [PATCH] (misc) Fix warning

7d90a802a54b53fc0d1cbae5e74375981f757210 seems to have reverted some
changes, and the Puppet Server reports the following:

Puppet Unknown variable: 'choria::root_group'. (file: /etc/puppetlabs/code/environments/production/modules/choria/manifests/config.pp, line: 55, column: 18)

Revert to the previous variable name.
---
 data/os/FreeBSD.yaml       | 2 +-
 manifests/broker/config.pp | 2 +-
 manifests/config.pp        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/os/FreeBSD.yaml b/data/os/FreeBSD.yaml
index f621fb3..307d33b 100644
--- a/data/os/FreeBSD.yaml
+++ b/data/os/FreeBSD.yaml
@@ -10,5 +10,5 @@ choria::rubypath: "/usr/local/bin/ruby"
 choria::broker_config_file: "/usr/local/etc/choria/broker.conf"
 choria::server_config_file: "/usr/local/etc/choria/server.conf"
 choria::server_provisioning_token_file: "/usr/local/etc/choria/provisioning.jwt"
-choria::root_group: "wheel"
+choria::config_group: "wheel"
 choria::mcollective_config_dir: "/usr/local/etc/mcollective"
diff --git a/manifests/broker/config.pp b/manifests/broker/config.pp
index 65717cc..f731dd9 100644
--- a/manifests/broker/config.pp
+++ b/manifests/broker/config.pp
@@ -6,7 +6,7 @@
 
   file{$choria::broker_config_file:
     owner   => "root",
-    group   => $choria::root_group,
+    group   => $choria::config_group,
     mode    => "0640",
     content => epp("choria/broker.cfg.epp"),
     notify  => Class["choria::broker::service"],
diff --git a/manifests/config.pp b/manifests/config.pp
index 2db39f8..4b72c69 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -52,7 +52,7 @@
   if $choria::manage_server_config {
     file{$choria::server_config_file:
       owner   => $choria::config_user,
-      group   => $choria::root_group,
+      group   => $choria::config_group,
       mode    => "0640",
       content => choria::hash2config($config),
       notify  => Class["choria::service"],
@@ -63,7 +63,7 @@
   if $choria::server_provisioning_token {
     file{$choria::server_provisioning_token_file:
       owner   => $choria::config_user,
-      group   => $choria::root_group,
+      group   => $choria::config_group,
       mode    => "0640",
       content => $choria::server_provisioning_token,
       notify  => Class["choria::service"],