Merge pull request choria-io#146 from smortex/fix-unknown-variable-ch…

…oria-root_group Fix warning: Unknown variable: 'choria::root_group'
smortex · Jan 11, 2020 · 70361b0 · 70361b0
2 parents b70f62d + f652c2b
commit 70361b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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"],