From 92df2764de41ef7ef6f6d7c17c3b60ca00e2dd5b Mon Sep 17 00:00:00 2001 From: Richard Shade Date: Wed, 1 Mar 2017 16:22:38 -0600 Subject: [PATCH] Fix stats socket (#41) * fixing Berksfile * updating to 3.0.1, and matching locations * updating changelog to match release --- Berksfile | 1 - Berksfile.lock | 67 +++++++++++++++++++++------------------------- CHANGELOG.md | 9 ++++++- metadata.rb | 4 +-- recipes/default.rb | 4 +-- 5 files changed, 42 insertions(+), 43 deletions(-) diff --git a/Berksfile b/Berksfile index 5c88ad0..a372b86 100644 --- a/Berksfile +++ b/Berksfile @@ -7,7 +7,6 @@ cookbook 'rs-base', github: 'rightscale-cookbooks/rs-base' cookbook 'rightscale_tag', github: 'rightscale-cookbooks/rightscale_tag' cookbook 'machine_tag', github: 'rightscale-cookbooks/machine_tag' cookbook 'rsc_remote_recipe', github: 'rightscale-services-cookbooks/rsc_remote_recipe' -cookbook 'haproxy', github: 'rightscale-cookbooks-contrib/haproxy', branch: 'centos-7-support' group :integration do cookbook 'rs-application_php', github: 'rightscale-cookbooks/rs-application_php' diff --git a/Berksfile.lock b/Berksfile.lock index db42aad..ef5308a 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -5,25 +5,21 @@ DEPENDENCIES branch: chef-12-migration fake path: test/cookbooks/fake - haproxy - git: https://github.com/rightscale-cookbooks-contrib/haproxy.git - revision: d000890cefdec3da84e6e1ca4338b6e516d88890 - branch: centos-7-support machine_tag git: https://github.com/rightscale-cookbooks/machine_tag.git - revision: 581dd0b7ddf2e65939527bb5e6c6c47788d1bf33 + revision: e3b01e6e3af364ce2ee73a28445f08c833a2ac3f marker git: https://github.com/rightscale-cookbooks/marker.git revision: 058e70879408fceceb628c600d487b1ddfa06cdb rightscale_tag git: https://github.com/rightscale-cookbooks/rightscale_tag.git - revision: d012cd3486fd9fc4efbf5200885bad521301c4b9 + revision: 93a8e1d1040f508623fa3cae4fbd7ecf67bcb450 rs-application_php git: https://github.com/rightscale-cookbooks/rs-application_php.git - revision: 2ab19575a3f89e65d414e8d4a55a7570507484a8 + revision: a8890d13daad3fab3b69b507540323ced0cc9398 rs-base git: https://github.com/rightscale-cookbooks/rs-base.git - revision: 6dae6b0ce17455210576ca8175f3ad9590547d22 + revision: 5d66d7b46d49d7c2a9eda6dafd12585c8abdfd0c rs-haproxy path: . metadata: true @@ -38,14 +34,12 @@ GRAPH apache2 (>= 0.0.0) application (~> 4.1) php (>= 0.0.0) - apt (5.0.1) - compat_resource (>= 12.16.3) - build-essential (7.0.3) - compat_resource (>= 12.16.3) + apt (6.0.1) + build-essential (8.0.0) mingw (>= 1.1) seven_zip (>= 0.0.0) chef-sugar (3.4.0) - collectd (2.2.2) + collectd (2.2.4) poise (~> 2.2) poise-service (~> 1.0) collectd_plugins (2.1.3) @@ -56,8 +50,9 @@ GRAPH database (6.1.1) postgresql (>= 1.0.0) dmg (3.1.0) - ephemeral_lvm (2.0.0) - lvm (~> 3.1) + ephemeral_lvm (3.0.0) + lvm (>= 4.0) + now (>= 0.0.0) fake (0.1.0) chef-sugar (>= 0.0.0) curl (>= 0.0.0) @@ -65,19 +60,19 @@ GRAPH rs-application_php (>= 0.0.0) rs-haproxy (>= 0.0.0) yum-mysql-community (>= 0.0.0) - git (5.0.2) + git (6.0.0) build-essential (>= 0.0.0) dmg (>= 0.0.0) yum-epel (>= 0.0.0) - haproxy (2.0.3) + haproxy (3.0.1) build-essential (>= 0.0.0) cpu (>= 0.2.0) poise-service (>= 0.0.0) hostsfile (2.4.5) iis (5.0.5) windows (>= 1.34.6) - lvm (3.1.0) - machine_tag (2.0.1) + lvm (4.0.5) + machine_tag (2.0.2) apt (>= 0.0.0) build-essential (>= 0.0.0) mariadb (1.0.1) @@ -85,35 +80,34 @@ GRAPH yum (>= 0.0.0) yum-epel (>= 0.0.0) marker (2.0.0) - mingw (1.2.5) - compat_resource (>= 12.16.3) + mingw (2.0.0) seven_zip (>= 0.0.0) mysql (8.2.0) mysql2_chef_gem (1.1.0) build-essential (>= 0.0.0) mariadb (>= 0.0.0) mysql (>= 6.0) + now (1.0.0) ntp (3.3.1) - ohai (4.2.3) - compat_resource (>= 12.14.7) + ohai (5.0.0) openssl (6.1.1) - php (2.2.0) + php (2.2.1) build-essential (>= 0.0.0) iis (>= 0.0.0) mysql (>= 6.0.0) xml (>= 0.0.0) yum-epel (>= 0.0.0) - poise (2.7.1) + poise (2.7.2) poise-service (1.4.2) poise (~> 2.0) postgresql (6.0.1) build-essential (>= 2.0.0) compat_resource (>= 12.16.3) openssl (>= 4.0) - rightscale_tag (2.0.0) + rightscale_tag (2.0.1) machine_tag (~> 2.0) marker (~> 2.0) - rs-application_php (2.0.0) + rs-application_php (2.0.1) application (>= 0.0.0) application_php (~> 2.0.2) collectd (>= 0.0.0) @@ -128,37 +122,36 @@ GRAPH rs-base (>= 0.0.0) rsc_remote_recipe (>= 0.0.0) yum-mysql-community (>= 0.0.0) - rs-base (2.0.0) + rs-base (2.0.1) apt (>= 0.0.0) collectd (~> 2.2.2) collectd_plugins (~> 2.1.3) - ephemeral_lvm (= 2.0.0) - machine_tag (~> 2.0.0) + ephemeral_lvm (~> 3.0) + machine_tag (~> 2.0) marker (>= 0.0.0) ntp (>= 0.0.0) - rightscale_tag (~> 2.0.0) + rightscale_tag (~> 2.0) rsyslog (>= 0.0.0) swap (>= 0.0.0) yum-epel (>= 0.0.0) - rs-haproxy (2.0.0) + rs-haproxy (2.0.1) collectd (>= 0.0.0) - haproxy (>= 0.0.0) + haproxy (~> 3.0) marker (>= 0.0.0) rightscale_tag (>= 0.0.0) rs-base (>= 0.0.0) rsc_remote_recipe (>= 0.0.0) rsc_remote_recipe (10.1.0) build-essential (>= 0.0.0) - rsyslog (5.1.0) - compat_resource (>= 12.14.6) + rsyslog (6.0.1) seven_zip (2.0.2) windows (>= 1.2.2) - swap (0.3.8) + swap (2.0.0) windows (2.1.1) ohai (>= 4.0.0) xml (3.1.1) build-essential (>= 0.0.0) - yum (4.1.0) + yum (5.0.0) yum-epel (2.1.1) compat_resource (>= 12.16.3) yum-mysql-community (2.0.3) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22feffa..541e9e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ rs-haproxy Cookbook CHANGELOG This file is used to list changes made in each version of the rs-haproxy cookbook. +v2.0.1 +------ +- pinning haproxy to ~> 3.0 +- removing fork haproxy in favor of supermarket version +- updating berksfile.lock for latest supermarket package +- fixing stats socket for haproxy 3.0 + v2.0.0 ------ - Remove support for Chef 11 @@ -61,4 +68,4 @@ v1.0.0 [#25]: https://github.com/rightscale-cookbooks/rs-haproxy/issues/25 -[#34]: https://github.com/rightscale-cookbooks/rs-haproxy/issues/34 \ No newline at end of file +[#34]: https://github.com/rightscale-cookbooks/rs-haproxy/issues/34 diff --git a/metadata.rb b/metadata.rb index 1cf084f..23e22b4 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,13 +4,13 @@ license 'Apache 2.0' description 'Application cookbook to set up HAProxy on a RightScale environment' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '2.0.0' +version '2.0.1' issues_url 'https://github.com/rightscale-cookbooks/rs-haproxy/issues' source_url 'https://github.com/rightscale-cookbooks/rs-haproxy' chef_version '>= 12.0' if respond_to?(:chef_version) depends 'marker' -depends 'haproxy' +depends 'haproxy', '~> 3.0' depends 'collectd' depends 'rightscale_tag' depends 'rs-base' diff --git a/recipes/default.rb b/recipes/default.rb index 9f46f05..8ea38cd 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -113,8 +113,8 @@ # Set up haproxy socket if node['haproxy']['enable_stats_socket'] node.default['haproxy']['config']['global']['stats'] = "socket #{node['haproxy']['stats_socket_path']}" \ - " user #{node['haproxy']['stats_socket_user']}" \ - " group #{node['haproxy']['stats_socket_group']}" + " user #{node['haproxy']['stats_socket']['user']}" \ + " group #{node['haproxy']['stats_socket']['group']}" end # Set up statistics URI