diff --git a/.vagrant-puppet/modules/icinga2/manifests/feature.pp b/.vagrant-puppet/modules/icinga2/manifests/feature.pp index e6ca49784..48a36cfec 100644 --- a/.vagrant-puppet/modules/icinga2/manifests/feature.pp +++ b/.vagrant-puppet/modules/icinga2/manifests/feature.pp @@ -2,10 +2,10 @@ define icinga2::feature ($feature = $title) { include icinga2 exec { "icinga2-feature-${feature}": - path => '/bin:/usr/bin:/sbin:/usr/sbin', - unless => "readlink /etc/icinga2/features-enabled/${feature}.conf", + path => '/bin:/usr/bin:/sbin:/usr/sbin', + unless => "readlink /etc/icinga2/features-enabled/${feature}.conf", command => "icinga2-enable-feature ${feature}", require => Package['icinga2'], - notify => Service['icinga2'] + notify => Service['icinga2'] } } diff --git a/.vagrant-puppet/modules/icinga2/manifests/init.pp b/.vagrant-puppet/modules/icinga2/manifests/init.pp index cd072bcc0..5a5d51abf 100644 --- a/.vagrant-puppet/modules/icinga2/manifests/init.pp +++ b/.vagrant-puppet/modules/icinga2/manifests/init.pp @@ -9,7 +9,7 @@ class icinga2 { package { [ 'icinga2', 'icinga2-doc', 'icinga2-debuginfo' ]: - ensure => latest, + ensure => latest, require => Class['icinga_packages'], } diff --git a/.vagrant-puppet/modules/icinga2_mysql/manifests/init.pp b/.vagrant-puppet/modules/icinga2_mysql/manifests/init.pp index 4b02908f0..5752cdc1e 100644 --- a/.vagrant-puppet/modules/icinga2_mysql/manifests/init.pp +++ b/.vagrant-puppet/modules/icinga2_mysql/manifests/init.pp @@ -2,16 +2,16 @@ class icinga2_mysql { include icinga_packages package { 'icinga2-ido-mysql': - ensure => latest, + ensure => latest, require => Class['icinga_packages'], } mysql::database::populate { 'icinga2': - username => 'icinga2', - password => 'icinga2', + username => 'icinga2', + password => 'icinga2', privileges => 'SELECT,INSERT,UPDATE,DELETE', schemafile => '/usr/share/icinga2-ido-mysql/schema/mysql.sql', - require => Package['icinga2-ido-mysql'], + require => Package['icinga2-ido-mysql'], } file { '/etc/icinga2/features-available/ido-mysql.conf': diff --git a/.vagrant-puppet/modules/monitoring_plugins/manifests/init.pp b/.vagrant-puppet/modules/monitoring_plugins/manifests/init.pp index 0cf4b897b..23b9f19d4 100644 --- a/.vagrant-puppet/modules/monitoring_plugins/manifests/init.pp +++ b/.vagrant-puppet/modules/monitoring_plugins/manifests/init.pp @@ -3,7 +3,7 @@ class monitoring_plugins { # nagios plugins from epel package { 'nagios-plugins-all': - ensure => installed, + ensure => installed, require => Class['epel'] } -} \ No newline at end of file +} diff --git a/.vagrant-puppet/modules/mysql/manifests/database.pp b/.vagrant-puppet/modules/mysql/manifests/database.pp index 5829a0975..81a9956f5 100644 --- a/.vagrant-puppet/modules/mysql/manifests/database.pp +++ b/.vagrant-puppet/modules/mysql/manifests/database.pp @@ -14,8 +14,8 @@ define mysql::database::populate ($username, $password, $privileges, $schemafile Exec { path => '/usr/bin' } mysql::database::create { $name: - username => $username, - password => $password, + username => $username, + password => $password, privileges => $privileges, } diff --git a/.vagrant-puppet/modules/openldap/manifests/init.pp b/.vagrant-puppet/modules/openldap/manifests/init.pp index e9f3c504b..187a5f57b 100644 --- a/.vagrant-puppet/modules/openldap/manifests/init.pp +++ b/.vagrant-puppet/modules/openldap/manifests/init.pp @@ -14,7 +14,7 @@ # class openldap { - package { ['openldap-servers', 'openldap-clients']: + package { ['openldap-servers', 'openldap-clients']: ensure => installed } diff --git a/.vagrant-puppet/modules/pear/manifests/package.pp b/.vagrant-puppet/modules/pear/manifests/package.pp index 90b807b3d..17de50ecf 100644 --- a/.vagrant-puppet/modules/pear/manifests/package.pp +++ b/.vagrant-puppet/modules/pear/manifests/package.pp @@ -31,15 +31,15 @@ define pear::package( if $channel { exec { "pear discover ${channel}": command => "sudo pear channel-discover ${channel}", - unless => "pear channel-info ${channel}", + unless => "pear channel-info ${channel}", require => $require_, - before => Exec["pear install ${name}"] + before => Exec["pear install ${name}"] } } exec { "pear install ${name}": command => "pear install --alldeps ${name}", - unless => "pear list ${name}", + unless => "pear list ${name}", require => $require_ } diff --git a/.vagrant-puppet/profiles/icinga_mysql/manifests/init.pp b/.vagrant-puppet/profiles/icinga_mysql/manifests/init.pp index 6d393e4a9..c5ab38a81 100644 --- a/.vagrant-puppet/profiles/icinga_mysql/manifests/init.pp +++ b/.vagrant-puppet/profiles/icinga_mysql/manifests/init.pp @@ -59,10 +59,10 @@ class icinga_mysql ($icingaVersion) { } mysql::database::populate { 'icinga': - username => 'icinga', - password => 'icinga', - privileges => 'SELECT,INSERT,UPDATE,DELETE', - schemafile => "/usr/local/src/icinga-mysql/icinga-${icingaVersion}/module/idoutils/db/mysql/mysql.sql", + username => 'icinga', + password => 'icinga', + privileges => 'SELECT,INSERT,UPDATE,DELETE', + schemafile => "/usr/local/src/icinga-mysql/icinga-${icingaVersion}/module/idoutils/db/mysql/mysql.sql", requirement => Cmmi['icinga-mysql'], } } diff --git a/.vagrant-puppet/profiles/icinga_pgsql/manifests/init.pp b/.vagrant-puppet/profiles/icinga_pgsql/manifests/init.pp index 37d4cd70c..a9590a913 100644 --- a/.vagrant-puppet/profiles/icinga_pgsql/manifests/init.pp +++ b/.vagrant-puppet/profiles/icinga_pgsql/manifests/init.pp @@ -60,9 +60,9 @@ class icinga_pgsql ($icingaVersion) { } pgsql::database::populate { 'icinga': - username => 'icinga', - password => 'icingaweb', + username => 'icinga', + password => 'icingaweb', schemafile => "/usr/local/src/icinga-pgsql/icinga-${icingaVersion}/module/idoutils/db/pgsql/pgsql.sql", - require => Cmmi['icinga-pgsql'], + require => Cmmi['icinga-pgsql'], } } diff --git a/.vagrant-puppet/profiles/icingaweb2/manifests/init.pp b/.vagrant-puppet/profiles/icingaweb2/manifests/init.pp index c3bb57c65..f0e13a47b 100644 --- a/.vagrant-puppet/profiles/icingaweb2/manifests/init.pp +++ b/.vagrant-puppet/profiles/icingaweb2/manifests/init.pp @@ -1,7 +1,7 @@ class icingaweb2 { mysql::database::create { 'icingaweb': - username => 'icingaweb', - password => 'icingaweb', + username => 'icingaweb', + password => 'icingaweb', privileges => 'ALL', }