Skip to content

Commit

Permalink
(misc) Fix warning
Browse files Browse the repository at this point in the history
7d90a80 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.
  • Loading branch information
smortex committed Jan 10, 2020
1 parent b70f62d commit f652c2b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion data/os/FreeBSD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion manifests/broker/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
4 changes: 2 additions & 2 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -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"],
Expand Down

0 comments on commit f652c2b

Please sign in to comment.