Merge pull request #263 from vkhatri/fixes-3

Bug Fixes

.kitchen.yml

@@ -17,8 +17,7 @@ platforms:
   - name: centos-7.2
   - name: ubuntu-14.04
   - name: ubuntu-16.04
-  - name: debian-7
-  - name: debian-8
+  - name: debian-8.5
 
 suites:
   - name: server

CHANGELOG.md

@@ -3,6 +3,66 @@ icinga2 CHANGELOG
 
 This file is used to list changes made in each version of the icinga2 cookbook.
 
+unlreleased
+-----
+
+- Virender Khatri - Added .ignore directory to ignore
+
+- Cody Sandwith - Fixes references to PHP Aptitude package names and paths, to support Ubuntu 16.04
+
+- Cody Sandwith - Fixed PHP.ini's location and date_timezone attribute
+
+- Cody Sandwith - Added icinga web2 packages release version
+
+- Cody Sandwith - Cleaned up Aptitude/Yum package declarations
+
+- Cody Sandwith - Updated recipes to be more compatible with lint, and cleaned up comments
+
+- JJ Asghar - Rubocop fix
+
+- Ankit Rusia - Fix missing parent attribute for icinga2_envzone
+
+- Blerim Sheqa - Ignore rubocop BlockLenth
+
+- Frederik Thuysbaert - Makes wrapping possible of the object templates that belong to Icinga2Instance resources
+
+- Blerim Sheqa - Fix Rubocop again
+
+- Virender Khatri - fixed specs for trusty
+
+- Jeroen Jacobs - PR #241, Updates the web2 git source url
+
+- Cody Sandwith - PR #246, Ubuntu 16.04 Compatibility updates
+
+- Virender Khatri - PR #247, rubocop fix
+
+- Virender Khatri - Issue #249, should fail if os detail is unknown for php.ini file location
+
+- Virender Khatri - PR #252, fixed typo for web2_version check
+
+- Virender Khatri - PR #253, allow ignore version for icingaweb2 and icingacli packages
+
+- Virender Khatri - Issue #244, set default timezone value UTC if missing
+
+- Virender Khatri - Issue #256, remove default git package for rhel platform_family
+
+- Virender Khatri - Issue #245, #242, Fixed icingacli version install error
+
+- Virender Khatri - Updated Packages version to latest
+
+- Virender Khatri - Issue #258, set apache2 default mpm to prefork for ubuntu
+
+- Virender Khatri - Updated Kitchen
+
+- Virender Khatri - Issue #236, default disable default icinga2 conf directory
+
+- Virender Khatri - Issue #255, support debian platform
+
+- Virender Khatri - Issue #255, fixed kitchen debian os version
+
+- Virender Khatri - Issue #262, use dependency cookbooks latest version
+
+
 2.9.1
 -----
 

README.md

@@ -205,6 +205,8 @@ If you are using this cookbook to manage `icinga2` configuration, set `default['
 
 Cookbook generated configuration files using LWRP are created under directory `default['icinga2']['objects_dir']`.
 
+>> `default['icinga2']['disable_conf_d']` default value is set to `true`.
+
 
 ### How to Install and Configure Icinga2 Server without UI
 
@@ -1944,7 +1946,7 @@ Above LWRP resource will apply `Dependency` to all `Host` objects for provided `
 
 ## Cookbook Advanced Attributes
 
-* `default['icinga2']['disable_conf_d']` (default: `false`): disable icinga2 `conf.d` default configuration directory in `icinga2.conf` and use LWRP to manage icinga2 objects / templates
+* `default['icinga2']['disable_conf_d']` (default: `true`): disable icinga2 `conf.d` default configuration directory in `icinga2.conf` and use LWRP to manage icinga2 objects / templates
 
 * `default['icinga2']['build_type']` (default: `release`): icinga2 repository build type, options: release snapshot
 

attributes/default.rb

@@ -18,7 +18,7 @@
 default['icinga2']['pnp'] = false
 
 # avoid conflicts
-default['icinga2']['disable_conf_d'] = false
+default['icinga2']['disable_conf_d'] = true
 default['icinga2']['disable_repository_d'] = false
 default['icinga2']['add_cloud_custom_vars'] = true
 default['icinga2']['add_inet_custom_vars'] = false

attributes/repo.rb

@@ -75,7 +75,11 @@
       default['icinga2']['apt']['key'] = 'http://debmon.org/debmon/repo.key'
 
       # icinga2 package version suffix
-      default['icinga2']['icinga2_version_suffix'] = '~debmon' + node['platform_version'].split('.')[0] + '0+1'
+      if node['platform_version'] > '7'
+        default['icinga2']['icinga2_version_suffix'] = '~debmon' + node['platform_version'].split('.')[0] + '+1'
+      else
+        default['icinga2']['icinga2_version_suffix'] = '~debmon' + node['platform_version'].split('.')[0] + '0+1'
+      end
     end
   end
 end

metadata.rb

@@ -10,12 +10,12 @@
 source_url 'https://github.com/Icinga/chef-icinga2' if respond_to?(:source_url)
 issues_url 'https://dev.icinga.org/projects/chef-icinga2' if respond_to?(:issues_url)
 
-depends 'apt'
-depends 'yum', '~> 3.0'
-depends 'yum-epel'
-depends 'apache2'
-depends 'ulimit'
-depends 'pnp4nagios'
+depends 'apt', '~> 5.0.1'
+depends 'yum', '~> 4.1.0'
+depends 'yum-epel', '~> 2.1.1'
+depends 'apache2', '~> 3.2.2'
+depends 'ulimit', '~> 0.4.0'
+depends 'pnp4nagios', '~> 0.2.8'
 
 %w(redhat centos amazon ubuntu debian).each do |os|
   supports os