tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added variable to pass options to opencollab-puppet-uploader

Browse source
This commit is contained in:
Ossi Salmi 2011-04-27 13:06:12 +03:00 • committed by Timo Mkinen
parent cf833fd8e8
commit f1fc87b750
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
puppet/manifests/init.pp
View file

@ -387,6 +387,9 @@ class puppet::server::apache inherits puppet::server::mongrel {
# $puppet_opencollab_pass: # $puppet_opencollab_pass:
# Wiki password. # Wiki password.
# #
# $puppet_opencollab_options:
# Extra options for opencollab-puppet-uploader.
#
class puppet::opencollab { class puppet::opencollab {
if !$puppet_opencollab_url { if !$puppet_opencollab_url {
@ -419,12 +422,20 @@ class puppet::opencollab {
content => "[creds]\nurl = ${puppet_opencollab_url}\nusername = ${puppet_opencollab_user}\npassword = ${puppet_opencollab_pass}\n", content => "[creds]\nurl = ${puppet_opencollab_url}\nusername = ${puppet_opencollab_user}\npassword = ${puppet_opencollab_pass}\n",
} }
case $operatingsystem {
ubuntu: { $script = "/usr/local/bin/opencollab-puppet-uploader" }
default: { $script = "/usr/bin/opencollab-puppet-uploader" }
}
if $puppet_opencollab_options {
$script_options = "-c /etc/puppet/opencollab.conf ${puppet_opencollab_options}"
} else {
$script_options = "-c /etc/puppet/opencollab.conf"
}
cron { "opencollab-puppet-uploader": cron { "opencollab-puppet-uploader":
ensure => present, ensure => present,
command => $operatingsystem ? { command => "${script} ${script_options} /var/lib/puppet/yaml/facts/*.yaml",
ubuntu => "/usr/local/bin/opencollab-puppet-uploader -c /etc/puppet/opencollab.conf /var/lib/puppet/yaml/facts/*.yaml",
default => "/usr/bin/opencollab-puppet-uploader -c /etc/puppet/opencollab.conf /var/lib/puppet/yaml/facts/*.yaml",
},
user => root, user => root,
minute => 0, minute => 0,
hour => 0, hour => 0,