From 4437c3b11c24c81d4b828993ededf6cd3d2d7aaf Mon Sep 17 00:00:00 2001 From: Konstantin Kokovikhin Date: Wed, 2 Aug 2017 16:56:30 +0300 Subject: [PATCH 1/6] Add subsetting_key_val_separator to logdest (#161) ini_subsetting 'puppet sysconfig logdest' resource generates puppet daemon option --logdest$logdest without delimeter --- manifests/config.pp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 813e5d3..bd60eca 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -208,12 +208,13 @@ } ini_subsetting { 'puppet sysconfig logdest': - ensure => $logdest_ensure, - section => '', - key_val_separator => '=', - path => "${sysconfigdir}/puppet", - setting => 'DAEMON_OPTS', - subsetting => '--logdest', - value => $logdest + ensure => $logdest_ensure, + section => '', + key_val_separator => '=', + subsetting_key_val_separator => ' ', + path => "${sysconfigdir}/puppet", + setting => 'DAEMON_OPTS', + subsetting => '--logdest', + value => $logdest } } From 00076736b86d21ec4333862492d02ee9f26f9bf7 Mon Sep 17 00:00:00 2001 From: Konstantin Kokovikhin Date: Wed, 2 Aug 2017 17:45:27 +0300 Subject: [PATCH 2/6] Fixed puppet::logdest test (#161) --- spec/classes/puppet_config_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/classes/puppet_config_spec.rb b/spec/classes/puppet_config_spec.rb index b344627..3f0be6f 100644 --- a/spec/classes/puppet_config_spec.rb +++ b/spec/classes/puppet_config_spec.rb @@ -183,6 +183,7 @@ 'path'=>"#{sysconfigdir}/puppet", 'section'=>'', 'key_val_separator' => '=', + 'subsetting_key_val_separator' => ' ', 'setting'=>'DAEMON_OPTS', 'subsetting'=>'--logdest', 'value'=>'/var/log/BOGON' From 0273daea86eae1425d98fa76fdaaf12a25d804dd Mon Sep 17 00:00:00 2001 From: Konstantin Kokovikhin Date: Thu, 2 Aug 2018 03:32:57 +0300 Subject: [PATCH 3/6] Bump puppetlabs/puppetdb version --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 2970c20..cfc1f0a 100644 --- a/metadata.json +++ b/metadata.json @@ -65,7 +65,7 @@ }, { "name": "puppetlabs/puppetdb", - "version_requirement": ">=5.0.0 <6.0.0" + "version_requirement": ">=5.0.0 <=7.0.1" }, { "name": "puppet/r10k", From b35ea9470d7a91e682e45e4bc43cdd4bd82445fd Mon Sep 17 00:00:00 2001 From: Konstantin Kokovikhin Date: Thu, 2 Aug 2018 03:41:43 +0300 Subject: [PATCH 4/6] Update puppetlabs/apache and puppetlabs/apt versions --- metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.json b/metadata.json index cfc1f0a..6e34052 100644 --- a/metadata.json +++ b/metadata.json @@ -49,7 +49,7 @@ "dependencies": [ { "name": "puppetlabs/apache", - "version_requirement": ">=1.4.0 <2.0.0" + "version_requirement": ">=1.4.0 <=3.2.0" }, { "name": "puppetlabs/stdlib", @@ -57,7 +57,7 @@ }, { "name": "puppetlabs/apt", - "version_requirement": ">=2.0.0 <3.0.0" + "version_requirement": ">=2.0.0 <5.0.0" }, { "name": "puppetlabs/inifile", From d2b1c6cc1d1f42f81a4cfc84dab822b384136991 Mon Sep 17 00:00:00 2001 From: Konstantin Kokovikhin Date: Thu, 2 Aug 2018 03:50:27 +0300 Subject: [PATCH 5/6] Update puppetlabs/inifile version --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 6e34052..9fb2ceb 100644 --- a/metadata.json +++ b/metadata.json @@ -61,7 +61,7 @@ }, { "name": "puppetlabs/inifile", - "version_requirement": ">=1.2.0 <2.0.0" + "version_requirement": ">=1.2.0 <3.0.0" }, { "name": "puppetlabs/puppetdb", From 076e4f7f79e954ea75eb34446af425be7eaf74fe Mon Sep 17 00:00:00 2001 From: Konstantin Kokovikhin Date: Thu, 2 Aug 2018 04:04:30 +0300 Subject: [PATCH 6/6] Update puppet/puppetboard version --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 9fb2ceb..b5d090d 100644 --- a/metadata.json +++ b/metadata.json @@ -73,7 +73,7 @@ }, { "name": "puppet/puppetboard", - "version_requirement": ">=2.7.0 <3.0.0" + "version_requirement": ">=2.7.0 <5.0.0" }, { "name": "puppetlabs/puppetserver_gem",