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

View File

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