Replace Package[icingacli] w/ Class[icingacli]

refs #6842
This commit is contained in:
Alexander Klimov 2014-09-15 14:42:54 +02:00
parent 616a95550c
commit 72d74c1132
1 changed files with 4 additions and 12 deletions

View File

@ -1,8 +1,8 @@
class icingaweb2_dev {
include apache
include php
include icinga_packages
include icingaweb2
include icingacli
class { 'zend_framework':
notify => Service['apache'],
@ -13,10 +13,7 @@ class icingaweb2_dev {
notify => Service['apache'],
}
package { 'icingacli':
ensure => latest,
require => Class['icinga_packages'],
}
Exec { path => '/usr/local/bin:/usr/bin:/bin' }
file { '/etc/icingaweb/enabledModules':
ensure => directory,
@ -31,23 +28,18 @@ class icingaweb2_dev {
-> exec { 'enable-monitoring-module':
command => 'icingacli module enable monitoring',
user => 'apache',
require => [
Package['icingacli'],
Class['apache']
],
require => Class[[ 'icingacli', 'apache' ]],
}
exec { 'usermod -aG icingacmd apache':
command => '/usr/sbin/usermod -aG icingacmd apache',
require => [
Package['icingacli'],
Class['icingacli'],
User['apache']
],
notify => Service['apache'],
}
Exec { path => '/bin:/usr/bin' }
mysql::database::populate { 'icingaweb':
username => 'icingaweb',
password => 'icingaweb',