Merged in oherrala/puppet (pull request #9)

This commit is contained in:
Timo Mäkinen 2012-05-18 18:28:07 +03:00
commit a7671ac442
3 changed files with 44 additions and 0 deletions

View file

@ -0,0 +1,18 @@
#
# Default settings for /etc/init.d/sysstat, /etc/cron.d/sysstat
# and /etc/cron.daily/sysstat files
#
# Should sadc collect system activity informations? Valid values
# are "true" and "false". Please do not put other values, they
# will be overwritten by debconf!
ENABLED="true"
# Additional options passed to sa1 by /etc/init.d/sysstat
# and /etc/cron.d/sysstat
# By default contains the `-S DISK' option responsible for
# generating disk statisitcs.
SA1_OPTIONS="-S DISK"
# Additional options passed to sa2 by /etc/cron.daily/sysstat.
SA2_OPTIONS=""

15
sysstat/manifests/init.pp Normal file
View file

@ -0,0 +1,15 @@
class sysstat {
package { "sysstat":
ensure => installed,
}
case $operatingsystem {
ubuntu: {
file { "/etc/default/sysstat":
ensure => present,
source => "puppet:///modules/sysstat/sysstat.default",
}
}
}
}

View file

@ -292,3 +292,14 @@ class yum::repo::skype {
} }
} }
# Add Puppetlabs repository
#
class yum::repo::puppetlabs {
yum::repo { "puppetlabs":
descr => "Puppet Labs Packages",
baseurl => "http://yum.puppetlabs.com/el/\$releasever/products/\$basearch",
gpgkey => "http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs",
}
}