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

merge changes into init.pp for apcupsd and rhizo cron

Browse source
This commit is contained in:
Wile E. Coyote 2017-01-13 23:31:58 +00:00
parent 5e29a94d29
commit c550f58bec
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/rhizo_base/manifests/init.pp
View file

@ -17,6 +17,7 @@ class rhizo_base {
$kannel_admin_password = hiera('rhizo::kannel_admin_password') $kannel_admin_password = hiera('rhizo::kannel_admin_password')
$password_hash = hiera('rhizo::password_hash') $password_hash = hiera('rhizo::password_hash')
$use_ups = hiera('rhizo::use_ups')
# Configuration settings # Configuration settings
$rhizomatica_dir = hiera('rhizo::rhizomatica_dir') $rhizomatica_dir = hiera('rhizo::rhizomatica_dir')
$sq_hlr_path = hiera('rhizo::sq_hlr_path') $sq_hlr_path = hiera('rhizo::sq_hlr_path')
@ -312,9 +313,20 @@ class rhizo_base {
require => Package['libapache2-mod-php5'], require => Package['libapache2-mod-php5'],
} }
file { '/etc/apcupsd/apcupsd.conf':
ensure => present,
source => 'puppet:///modules/rhizo_base/etc/apcupsd/apcupsd.conf',
require => Package['apcupsd'],
}
file { '/etc/default/apcupsd':
ensure => 'present',
content => template('rhizo_base/apcupsd.erb'),
}
file { '/etc/cron.d/rhizomatica': file { '/etc/cron.d/rhizomatica':
source => 'puppet:///modules/rhizo_base/etc/cron.d/rhizomatica', ensure => 'present',
content => template('rhizo_base/rhizomatica.cron.erb'),
} }
host { 'mail': host { 'mail':