diff --git a/AUTHORS b/AUTHORS index 8da75eecd..b9b9f5b44 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,6 +12,7 @@ Florian Baumann Gunnar Beutner James Fryman Jan-Otto Kröpke +Jerome Charaoui Lennart Betz Markus Frosch Matthias Ritter @@ -27,3 +28,4 @@ Tom De Vylder Tomas Barton Wyatt Alt Zach Leslie +murmur diff --git a/CHANGELOG.md b/CHANGELOG.md index b2204df3c..2507aadef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## [v1.3.6](https://github.com/Icinga/puppet-icinga2/tree/v1.3.6) (2018-04-25) +[Full Changelog](https://github.com/Icinga/puppet-icinga2/compare/v1.3.5...v1.3.6) + +**Implemented enhancements:** + +- Add support for SLC6 Linux [\#441](https://github.com/Icinga/puppet-icinga2/pull/441) ([HristoMohamed](https://github.com/HristoMohamed)) +- Support manage\_repo on XenServer [\#436](https://github.com/Icinga/puppet-icinga2/pull/436) ([jcharaoui](https://github.com/jcharaoui)) + +**Fixed bugs:** + +- Changes on concat resource for objects does not trigger a refresh on puppet3 [\#434](https://github.com/Icinga/puppet-icinga2/issues/434) +- don't quote null [\#433](https://github.com/Icinga/puppet-icinga2/issues/433) + +**Closed issues:** + +- Using apply in a service causes service\_name not to be applied to service leading to duplicate resource issues [\#429](https://github.com/Icinga/puppet-icinga2/issues/429) +- Applying services to hostgroups [\#427](https://github.com/Icinga/puppet-icinga2/issues/427) + +**Merged pull requests:** + +- Bug/do not quote null 433 [\#435](https://github.com/Icinga/puppet-icinga2/pull/435) ([lbetz](https://github.com/lbetz)) + ## [v1.3.5](https://github.com/Icinga/puppet-icinga2/tree/v1.3.5) (2018-01-24) [Full Changelog](https://github.com/Icinga/puppet-icinga2/compare/v1.3.4...v1.3.5) @@ -548,4 +570,4 @@ ## [v0.6.1](https://github.com/Icinga/puppet-icinga2/tree/v0.6.1) (2014-12-03) -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* diff --git a/manifests/debian/dbconfig.pp b/manifests/debian/dbconfig.pp deleted file mode 100644 index d29f2e9eb..000000000 --- a/manifests/debian/dbconfig.pp +++ /dev/null @@ -1,72 +0,0 @@ -# == Class: icinga2::debian::dbconfig -# -class icinga2::debian::dbconfig( - Enum['mysql', 'pgsql'] $dbtype, - String $dbserver, - Integer[1,65535] $dbport, - String $dbname, - String $dbuser, - String $dbpass, - Boolean $ssl = false, -) { - - assert_private() - - # dbconfig config for Debian or Ubuntu - if $::osfamily == 'debian' { - - case $dbtype { - 'mysql': { - $default_port = 3306 - $path = "/etc/dbconfig-common/${::icinga2::globals::ido_mysql_package_name}.conf" - } - 'pgsql': { - $default_port = 5432 - $path = "/etc/dbconfig-common/${::icinga2::globals::ido_pgsql_package_name}.conf" - } - default: { - fail("Unsupported dbtype: ${dbtype}") - } - } - - file_line { "dbc-${dbtype}-dbuser": - path => $path, - line => "dbc_dbuser='${dbuser}'", - match => '^dbc_dbuser\s*=', - } - file_line { "dbc-${dbtype}-dbpass": - path => $path, - line => "dbc_dbpass='${dbpass}'", - match => '^dbc_dbpass\s*=', - } - file_line { "dbc-${dbtype}-dbname": - path => $path, - line => "dbc_dbname='${dbname}'", - match => '^dbc_dbname\s*=', - } - # only set host if isn't the default - if $dbserver != '127.0.0.1' and $dbserver != 'localhost' { - file_line { "dbc-${dbtype}-dbserver": - path => $path, - line => "dbc_dbserver='${dbserver}'", - match => '^dbc_dbserver\s*=', - } - } - # only set port if isn't the default - if $dbport != $default_port { - file_line { "dbc-${dbtype}-dbport": - path => $path, - line => "dbc_dbport='${dbport}'", - match => '^dbc_dbport\s*=', - } - } - # set ssl - if $ssl { - file_line { "dbc-${dbtype}-ssl": - path => $path, - line => "dbc_ssl='true'", - match => '^dbc_ssl\s*=', - } - } - } # debian dbconfig -} diff --git a/manifests/feature/idomysql.pp b/manifests/feature/idomysql.pp index 944402e69..8e8ca3514 100644 --- a/manifests/feature/idomysql.pp +++ b/manifests/feature/idomysql.pp @@ -280,23 +280,27 @@ failover_timeout => $failover_timeout, cleanup => $cleanup, categories => $categories, - } # install additional package - if $ido_mysql_package_name and $manage_package { - package { $ido_mysql_package_name: + if $ido_mysql_package and $manage_package { + if $::osfamily == 'debian' { + ensure_resources('file', { '/etc/dbconfig-common' => { + ensure => directory, + mode => '0755', + } }) + file { "/etc/dbconfig-common/${ido_mysql_package}.conf": + ensure => file, + content => "dbc_install='false'\ndbc_upgrade='false'\ndbc_remove='false'\n", + mode => '0600', + before => Package[$ido_mysql_package], + } + } # Debian + + package { $ido_mysql_package: ensure => installed, before => Icinga2::Feature['ido-mysql'], } - -> class { '::icinga2::debian::dbconfig': - dbtype => 'mysql', - dbserver => $host, - dbport => $port, - dbname => $database, - dbuser => $user, - dbpass => $password, - } } # import db schema diff --git a/manifests/feature/idopgsql.pp b/manifests/feature/idopgsql.pp index a3d4b796e..bd275a339 100644 --- a/manifests/feature/idopgsql.pp +++ b/manifests/feature/idopgsql.pp @@ -117,19 +117,24 @@ } # install additional package - if $ido_pgsql_package_name and $manage_package { - package { $ido_pgsql_package_name: + if $ido_pgsql_package and $manage_package { + if $::osfamily == 'debian' { + ensure_resources('file', { '/etc/dbconfig-common' => { + ensure => directory, + mode => '0755', + } }) + file { "/etc/dbconfig-common/${ido_pgsql_package}.conf": + ensure => file, + content => "dbc_install='false'\ndbc_upgrade='false'\ndbc_remove='false'\n", + mode => '0600', + before => Package[$ido_pgsql_package], + } + } # Debian + + package { $ido_pgsql_package: ensure => installed, before => Icinga2::Feature['ido-pgsql'], } - -> class { '::icinga2::debian::dbconfig': - dbtype => 'pgsql', - dbserver => $host, - dbport => $port, - dbname => $database, - dbuser => $user, - dbpass => $password, - } } # import db schema diff --git a/manifests/repo.pp b/manifests/repo.pp index 849157032..b207a789f 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -23,7 +23,7 @@ case $::osfamily { 'redhat': { case $::operatingsystem { - 'centos', 'redhat', 'oraclelinux', 'cloudlinux', 'xenserver': { + 'centos', 'redhat', 'oraclelinux', 'cloudlinux', 'xenserver', 'slc': { yumrepo { 'icinga-stable-release': baseurl => "http://packages.icinga.com/epel/${::operatingsystemmajrelease}/release/", descr => 'ICINGA (stable release for epel)', diff --git a/metadata.json b/metadata.json index dbba589c2..f16ac01da 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "icinga-icinga2", - "version": "1.3.5", + "version": "1.3.6", "author": "Icinga Development Team", "summary": "Icinga 2 Puppet Module", "license": "Apache-2.0",