From a80fcf5924016fdbb11cdc7db3080bf6001537a0 Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Tue, 24 Oct 2023 10:14:49 +0100 Subject: [PATCH 1/5] fix curl --- resources/metadata.rb | 2 +- resources/providers/config.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/metadata.rb b/resources/metadata.rb index a40633e..f9cd12c 100644 --- a/resources/metadata.rb +++ b/resources/metadata.rb @@ -4,4 +4,4 @@ license 'All rights reserved' description 'Installs/Configures cookbook-pmacct' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.0.3' +version '0.0.4' diff --git a/resources/providers/config.rb b/resources/providers/config.rb index d373a05..9003c4c 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -106,7 +106,7 @@ json_query = Chef::JSONCompat.to_json(query) execute 'Register service in consul' do - command "curl http://localhost:8500/v1/agent/service/register -d '#{json_query}' &>/dev/null" + command "curl -X PUT http://localhost:8500/v1/agent/service/register -d '#{json_query}' &>/dev/null" action :nothing end.run_action(:run) @@ -122,7 +122,7 @@ begin if node["pmacct"]["registered"] execute 'Deregister service in consul' do - command "curl http://localhost:8500/v1/agent/service/deregister/sfacct-#{node["hostname"]} &>/dev/null" + command "curl -X PUT http://localhost:8500/v1/agent/service/deregister/sfacct-#{node["hostname"]} &>/dev/null" action :nothing end.run_action(:run) From 05b752982354ca0cae618761ffe9c5deae152759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Negr=C3=B3n?= <45871721+manegron@users.noreply.github.com> Date: Sun, 26 May 2024 10:02:04 +0100 Subject: [PATCH 2/5] Update metadata.rb --- resources/metadata.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/metadata.rb b/resources/metadata.rb index f9cd12c..1764330 100644 --- a/resources/metadata.rb +++ b/resources/metadata.rb @@ -1,7 +1,6 @@ name 'pmacct' -maintainer 'Juan J. Prieto' -maintainer_email 'jjprieto@redborder.com' -license 'All rights reserved' +maintainer 'Eneo Tecnología S.L.' +maintainer_email 'git@redborder.com' +license 'AGPL-3.0' description 'Installs/Configures cookbook-pmacct' -long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '0.0.4' From 05b84d8c123ef92110f47c2b142188b96629155e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Negr=C3=B3n?= <45871721+manegron@users.noreply.github.com> Date: Fri, 31 May 2024 08:50:39 +0100 Subject: [PATCH 3/5] Update default.rb --- resources/recipes/default.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/recipes/default.rb b/resources/recipes/default.rb index 8213d8a..c85e634 100644 --- a/resources/recipes/default.rb +++ b/resources/recipes/default.rb @@ -8,6 +8,5 @@ # pmacct_config "config" do - sensors node["redborder"]["sensors_info"]["flow-sensor"] action :add end From ef19a4c767d5904e2c0e5606e11bd01890f3b116 Mon Sep 17 00:00:00 2001 From: nilsver Date: Fri, 31 May 2024 09:21:01 +0100 Subject: [PATCH 4/5] create pmacct dir --- resources/providers/config.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/providers/config.rb b/resources/providers/config.rb index a0b7c19..d0db552 100644 --- a/resources/providers/config.rb +++ b/resources/providers/config.rb @@ -27,6 +27,12 @@ not_if "getent passwd #{user}" end + directory "/etc/pmacct" do + owner user + group group + mode 0755 + end + flow_nodes = [] template "/etc/pmacct/sfacctd.conf" do @@ -71,7 +77,7 @@ action :remove do begin - + service "sfacctd" do service_name "sfacctd" ignore_failure true From b67893b1a0dbf958c9639369e2d0122bbda41792 Mon Sep 17 00:00:00 2001 From: Miguel Negron Date: Sun, 2 Jun 2024 00:25:40 +0100 Subject: [PATCH 5/5] Release 0.0.5 --- CHANGELOG.md | 24 ++++++++++++++++++------ resources/metadata.rb | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b8af15..a8de4f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,24 @@ cookbook-pmacct CHANGELOG -=========================== +=============== -This file is used to list changes made in each version of the pmacct cookbook. +## 0.0.5 -0.0.1 ------ -- [jjprieto] - - COMMIT_REF Initial release of cookbook pmacct + - Miguel Negrón + - [397a3ba] Merge pull request #6 from redBorder/bugfix/17493_pmacct_dir_not_created + - [05b84d8] Update default.rb + - [b7f5a97] Merge pull request #1 from redBorder/bugfix/#15368_fix_register_and_deregister + - [a8afa01] Merge branch 'development' into bugfix/#15368_fix_register_and_deregister + - [de65490] Merge pull request #5 from redBorder/master + - [05b7529] Update metadata.rb + - nilsver + - [ef19a4c] create pmacct dir + - Luis Blanco + - [a80fcf5] fix curl + +## 0.0.1 + + - [jjprieto] + - COMMIT_REF Initial release of cookbook pmacct - - - Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown. diff --git a/resources/metadata.rb b/resources/metadata.rb index e01e797..c05add2 100644 --- a/resources/metadata.rb +++ b/resources/metadata.rb @@ -3,4 +3,4 @@ maintainer_email 'git@redborder.com' license 'AGPL-3.0' description 'Installs/Configures cookbook-pmacct' -version '0.0.4' \ No newline at end of file +version '0.0.5' \ No newline at end of file