Skip to content

Commit

Permalink
Merge pull request #189 from snoir/openbsd-support
Browse files Browse the repository at this point in the history
(#188) Add OpenBSD support
  • Loading branch information
ripienaar authored Jul 31, 2018
2 parents 02553a5 + 2a04405 commit ca8c944
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 2 deletions.
1 change: 1 addition & 0 deletions data/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ mcollective::plugin_mode: "0644"
mcollective::libdir: "/opt/puppetlabs/mcollective/plugins"
mcollective::configdir: "/etc/puppetlabs/mcollective"
mcollective::rubypath: "/opt/puppetlabs/puppet/bin/ruby"
mcollective::gem_provider: "puppet_gem"
mcollective::plugintypes:
- "agent"
- "aggregate"
Expand Down
22 changes: 22 additions & 0 deletions data/os/OpenBSD.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
mcollective::plugin_group: wheel
mcollective::service_name: mcollectived
mcollective::configdir: "/etc/mcollective"
mcollective::libdir: "/usr/local/libexec/mcollective"
mcollective::rubypath: "/usr/local/bin/ruby24"
mcollective::gem_provider: "gem"
mcollective::manage_package: true

mcollective::server_config:
classesfile: "/var/puppetlabs/puppet/cache/state/classes.txt"
rpcauthorization: 1
rpcauthprovider: "action_policy"
rpcaudit: 1
rpcauditprovider: "choria"
plugin.rpcaudit.logfile: "/var/log/puppetlabs/mcollective-audit.log"
factsource: "yaml"
plugin.yaml: "/etc/mcollective/generated-facts.yaml"
registerinterval: 10
registration: "Choria"
logfile: "/var/log/puppetlabs/mcollective.log"
daemonize: 1
3 changes: 2 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
Boolean $client,
Boolean $server,
Boolean $purge,
Optional[String] $gem_source = undef
Optional[String] $gem_source = undef,
String $gem_provider
) {
$factspath = "${configdir}/generated-facts.yaml"

Expand Down
2 changes: 1 addition & 1 deletion manifests/module_plugin.pp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
$gem_dependencies.each |$gem, $version| {
package{$gem:
ensure => $version,
provider => "puppet_gem",
provider => $mcollective::gem_provider,
source => $mcollective::gem_source,
tag => "mcollective_plugin_${name}_packages"
}
Expand Down

0 comments on commit ca8c944

Please sign in to comment.