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

puppet: Run opencollab-puppet-uploader as puppet user

Browse source
This commit is contained in:
Ossi Salmi 2013-11-02 23:15:53 +02:00
parent 3a119a5340
commit 403c747ce4
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
puppet/manifests/init.pp
View file

@ -711,28 +711,30 @@ class puppet::opencollab {
fail("\$puppet_opencollab_pass must be set.") fail("\$puppet_opencollab_pass must be set.")
} }
include wiki::opencollab require wiki::opencollab
package { "PyYAML": package { "PyYAML":
ensure => installed,
name => $::operatingsystem ? { name => $::operatingsystem ? {
debian => "python-yaml", debian => "python-yaml",
ubuntu => "python-yaml", ubuntu => "python-yaml",
default => "PyYAML", default => "PyYAML",
}, },
ensure => installed, before => Cron["puppet-opencollab"],
before => Class["wiki::opencollab"],
} }
file { "/etc/puppet/opencollab.conf": file { "/etc/puppet/opencollab.conf":
ensure => present, ensure => present,
mode => "0600", mode => "0640",
owner => "root", owner => "root",
group => "root", group => "puppet",
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",
require => Package["puppetmaster"],
before => Cron["puppet-opencollab"],
} }
case $::operatingsystem { case $::operatingsystem {
ubuntu: { $script = "/usr/local/bin/opencollab-puppet-uploader" } "ubuntu": { $script = "/usr/local/bin/opencollab-puppet-uploader" }
default: { $script = "/usr/bin/opencollab-puppet-uploader" } default: { $script = "/usr/bin/opencollab-puppet-uploader" }
} }
@ -743,12 +745,19 @@ class puppet::opencollab {
} }
cron { "opencollab-puppet-uploader": cron { "opencollab-puppet-uploader":
ensure => present, ensure => absent,
command => "${script} ${script_options} /var/lib/puppet/yaml/facts/*.yaml", command => "${script} ${script_options} /var/lib/puppet/yaml/facts/*.yaml",
user => root, user => root,
hour => 0, hour => 0,
minute => 5, minute => 5,
require => [ Class["wiki::opencollab"], File["/etc/puppet/opencollab.conf"] ], }
cron { "puppet-opencollab":
ensure => present,
command => "${script} ${script_options} /var/lib/puppet/yaml/facts/*.yaml",
user => "puppet",
hour => "0",
minute => "5",
} }
} }