Merge pull request #35 from svanharmelen/master

Version v0.3.5

Berksfile

@@ -1,2 +1,2 @@
-source "https://supermarket.getchef.com"
+source "https://supermarket.chef.io"
 metadata

CHANGELOG.md

@@ -1,6 +1,10 @@
 Chef-Guard CHANGELOG
 ====================
 
+0.3.5
+-----
+- Sander van Harmelen - Updated the version attibutes to use the latest release of Chef-Guard v0.6.2
+
 0.3.4
 -----
 - Bart Groenendal - Added systemd support for CentOS / RHEL 7 and up.

attributes/default.rb

@@ -1,113 +1,113 @@
-#
-# Cookbook Name:: chef-guard
-# Attribute:: default
-#
-# Copyright 2014, Sander van Harmelen
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-default['chef-guard']['version']       = '0.6.1'
-default['chef-guard']['install_dir']   = '/opt/chef-guard'
-default['chef-guard']['vault']         = 'chef-guard'
-default['chef-guard']['vault_item']    = 'chef.bookshelf'
-
-if kernel['machine'] =~ /x86_64/
-  default['chef-guard']['url']      = "https://github.com/xanzy/chef-guard/releases/download/v#{node['chef-guard']['version']}/chef-guard-v#{node['chef-guard']['version']}-linux-x64.tar.gz"
-  default['chef-guard']['checksum'] = 'b64fcc4003cf2c0d8a94f7df88088aedfea563403a5fd3405fe33a1077e931d9'
-else
-  default['chef-guard']['url']      = "https://github.com/xanzy/chef-guard/releases/download/v#{node['chef-guard']['version']}/chef-guard-v#{node['chef-guard']['version']}-linux-x86.tar.gz"
-  default['chef-guard']['checksum'] = 'ab0ce668a68a59da2c443a6c0084557b23699a09fc91bb4e752f63875980d62a'
-end
-
-# These options are used for the 'Default' section
-default['chef-guard']['config']['default']['listenip']        = '127.0.0.2'
-default['chef-guard']['config']['default']['listenport']      = '8000'
-default['chef-guard']['config']['default']['logfile']         = '/var/log/chef-guard.log'
-default['chef-guard']['config']['default']['tempdir']         = '/var/tmp/chef-guard'
-default['chef-guard']['config']['default']['mode']            = 'silent'
-default['chef-guard']['config']['default']['maildomain']      = ''
-default['chef-guard']['config']['default']['mailserver']      = ''
-default['chef-guard']['config']['default']['mailport']        = '25'
-default['chef-guard']['config']['default']['mailrecipient']   = ''
-default['chef-guard']['config']['default']['validatechanges'] = 'permissive'
-default['chef-guard']['config']['default']['commitchanges']   = true
-default['chef-guard']['config']['default']['mailchanges']     = true
-default['chef-guard']['config']['default']['searchgit']       = true
-default['chef-guard']['config']['default']['publishcookbook'] = true
-default['chef-guard']['config']['default']['blacklist']       = ''
-default['chef-guard']['config']['default']['gitorganization'] = 'chef-guard'
-default['chef-guard']['config']['default']['gitcookbookorgs'] = ''
-default['chef-guard']['config']['default']['includefcs']      = ''
-default['chef-guard']['config']['default']['excludefcs']      = ''
-
-# These options are used for the 'Chef' section
-default['chef-guard']['config']['chef']['type']            = 'enterprise'
-default['chef-guard']['config']['chef']['version']         = 11
-default['chef-guard']['config']['chef']['server']          = 'chef.company.com'
-default['chef-guard']['config']['chef']['port']            = '443'
-default['chef-guard']['config']['chef']['sslnoverify']     = false
-default['chef-guard']['config']['chef']['erchefip']        = '127.0.0.1'
-default['chef-guard']['config']['chef']['erchefport']      = '8000'
-default['chef-guard']['config']['chef']['user']            = 'chef-guard'
-default['chef-guard']['config']['chef']['key']             = "#{node['chef-guard']['install_dir']}/chef.pem"
-
-# This option is used for the 'ChefClients' section
-default['chef-guard']['config']['chefclients']['path'] = "#{node['chef-guard']['install_dir']}/clients"
-
-# These options are used for the 'Community' section
-default['chef-guard']['config']['community']['supermarket'] = 'https://supermarket.getchef.com'
-default['chef-guard']['config']['community']['forks']       = ''
-
-# These options are used for the 'Supermarket' section
-#
-# If you don't have an internal Supermarket, replace the values below with just:
-#default['chef-guard']['config']['supermarket'] = nil
-default['chef-guard']['config']['supermarket']['server']      = 'supermarket.company.com'
-default['chef-guard']['config']['supermarket']['port']        = 443
-default['chef-guard']['config']['supermarket']['sslnoverify'] = false
-default['chef-guard']['config']['supermarket']['user']        = 'chef-guard'
-default['chef-guard']['config']['supermarket']['key']         = "#{node['chef-guard']['install_dir']}/supermarket.pem"
-
-# These options are used for the 'Tests' section
-default['chef-guard']['config']['tests']['foodcritic'] = '/opt/chef/embedded/bin/foodcritic'
-default['chef-guard']['config']['tests']['rubocop']    = '/opt/chef/embedded/bin/rubocop'
-
-# Add a regex used to determine if the custom foodcritic tests should be run against
-# the cookbook being uploaded. It will match the regex against the cookbook name.
-default['chef-guard']['foodcritic']['matches'] = '.*'
-
-# These options are used to configure the used Git organizations
-#default['chef-guard']['config']['git']['org1'] = {
-#  'type' => 'github',
-#  'serverurl' => '',
-#  'sslnoverify' => false,
-#  'token' => 'xxx'
-#}
+#
+# Cookbook Name:: chef-guard
+# Attribute:: default
+#
+# Copyright 2014, Sander van Harmelen
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+default['chef-guard']['version']       = '0.6.2'
+default['chef-guard']['install_dir']   = '/opt/chef-guard'
+default['chef-guard']['vault']         = 'chef-guard'
+default['chef-guard']['vault_item']    = 'chef.bookshelf'
+
+if kernel['machine'] =~ /x86_64/
+  default['chef-guard']['url']      = "https://github.com/xanzy/chef-guard/releases/download/v#{node['chef-guard']['version']}/chef-guard-v#{node['chef-guard']['version']}-linux-x64.tar.gz"
+  default['chef-guard']['checksum'] = '00cc02505462645fd133ed1c4ceff5fc4311f1a3b242da177156b5cf98f4d66b'
+else
+  default['chef-guard']['url']      = "https://github.com/xanzy/chef-guard/releases/download/v#{node['chef-guard']['version']}/chef-guard-v#{node['chef-guard']['version']}-linux-x86.tar.gz"
+  default['chef-guard']['checksum'] = '5c7f01b43893f6d71e4bf1c1368e514f9f89fd53437ad7b917e6d47270bf2150'
+end
+
+# These options are used for the 'Default' section
+default['chef-guard']['config']['default']['listenip']        = '127.0.0.2'
+default['chef-guard']['config']['default']['listenport']      = '8000'
+default['chef-guard']['config']['default']['logfile']         = '/var/log/chef-guard.log'
+default['chef-guard']['config']['default']['tempdir']         = '/var/tmp/chef-guard'
+default['chef-guard']['config']['default']['mode']            = 'silent'
+default['chef-guard']['config']['default']['maildomain']      = ''
+default['chef-guard']['config']['default']['mailserver']      = ''
+default['chef-guard']['config']['default']['mailport']        = '25'
+default['chef-guard']['config']['default']['mailrecipient']   = ''
+default['chef-guard']['config']['default']['validatechanges'] = 'permissive'
+default['chef-guard']['config']['default']['commitchanges']   = true
+default['chef-guard']['config']['default']['mailchanges']     = true
+default['chef-guard']['config']['default']['searchgit']       = true
+default['chef-guard']['config']['default']['publishcookbook'] = true
+default['chef-guard']['config']['default']['blacklist']       = ''
+default['chef-guard']['config']['default']['gitorganization'] = 'chef-guard'
+default['chef-guard']['config']['default']['gitcookbookorgs'] = ''
+default['chef-guard']['config']['default']['includefcs']      = ''
+default['chef-guard']['config']['default']['excludefcs']      = ''
+
+# These options are used for the 'Chef' section
+default['chef-guard']['config']['chef']['type']            = 'enterprise'
+default['chef-guard']['config']['chef']['version']         = 11
+default['chef-guard']['config']['chef']['server']          = 'chef.company.com'
+default['chef-guard']['config']['chef']['port']            = '443'
+default['chef-guard']['config']['chef']['sslnoverify']     = false
+default['chef-guard']['config']['chef']['erchefip']        = '127.0.0.1'
+default['chef-guard']['config']['chef']['erchefport']      = '8000'
+default['chef-guard']['config']['chef']['user']            = 'chef-guard'
+default['chef-guard']['config']['chef']['key']             = "#{node['chef-guard']['install_dir']}/chef.pem"
+
+# This option is used for the 'ChefClients' section
+default['chef-guard']['config']['chefclients']['path'] = "#{node['chef-guard']['install_dir']}/clients"
+
+# These options are used for the 'Community' section
+default['chef-guard']['config']['community']['supermarket'] = 'https://supermarket.getchef.com'
+default['chef-guard']['config']['community']['forks']       = ''
+
+# These options are used for the 'Supermarket' section
+#
+# If you don't have an internal Supermarket, replace the values below with just:
+#default['chef-guard']['config']['supermarket'] = nil
+default['chef-guard']['config']['supermarket']['server']      = 'supermarket.company.com'
+default['chef-guard']['config']['supermarket']['port']        = 443
+default['chef-guard']['config']['supermarket']['sslnoverify'] = false
+default['chef-guard']['config']['supermarket']['user']        = 'chef-guard'
+default['chef-guard']['config']['supermarket']['key']         = "#{node['chef-guard']['install_dir']}/supermarket.pem"
+
+# These options are used for the 'Tests' section
+default['chef-guard']['config']['tests']['foodcritic'] = '/opt/chef/embedded/bin/foodcritic'
+default['chef-guard']['config']['tests']['rubocop']    = '/opt/chef/embedded/bin/rubocop'
+
+# Add a regex used to determine if the custom foodcritic tests should be run against
+# the cookbook being uploaded. It will match the regex against the cookbook name.
+default['chef-guard']['foodcritic']['matches'] = '.*'
+
+# These options are used to configure the used Git organizations
+#default['chef-guard']['config']['git']['org1'] = {
+#  'type' => 'github',
+#  'serverurl' => '',
+#  'sslnoverify' => false,
+#  'token' => 'xxx'
+#}
 #default['chef-guard']['config']['git']['org2'] = {
-#  'type' => 'github',
-#  'serverurl' => 'https://github.company.com',
+#  'type' => 'github',
+#  'serverurl' => 'https://github.company.com',
 #  'sslnoverify' => false,
-#  'token' => 'xxx'
-#}
-
-# These options are used to configure the Chef organizations (only used with Enterpise Chef or Chef 12)
-#default['chef-guard']['config']['customers']['demo1'] = {
-#  'mailchanges' => false,
-#  'searchgit' => false
-#}
-#default['chef-guard']['config']['customers']['demo2'] = {
-#  'mailrecipient' => '[email protected]',
-#  'gitcookbookorgs' => 'org1, org2'
-#}
+#  'token' => 'xxx'
+#}
+
+# These options are used to configure the Chef organizations (only used with Enterpise Chef or Chef 12)
+#default['chef-guard']['config']['customers']['demo1'] = {
+#  'mailchanges' => false,
+#  'searchgit' => false
+#}
+#default['chef-guard']['config']['customers']['demo2'] = {
+#  'mailrecipient' => '[email protected]',
+#  'gitcookbookorgs' => 'org1, org2'
+#}

metadata.rb

@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs/Configures Chef-Guard'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.3.4'
+version          '0.3.5'
 
 %w(redhat centos ubuntu).each do |os|
   supports os