From 470d7b54e26a0271d3485838fc4b71717550305e Mon Sep 17 00:00:00 2001 From: Nicolas Brousse Date: Sat, 6 Jun 2015 10:20:24 -0700 Subject: [PATCH 1/5] Fix Puppet-lint Warning and Errors. Issue #1. Change-Id: I06f63e472be309b05fa18c628cc17a6896d165c9 --- manifests/init.pp | 20 ++++++++++---------- manifests/install.pp | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 2532ec4..cf81edf 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -100,21 +100,21 @@ $config_props = hiera('aptly::properties', { 'downloadConcurrency' => 4, 'downloadSpeedLimit' => 0, - 'dependencyFollowSuggests' => 'false', - 'dependencyFollowRecommends' => 'false', - 'dependencyFollowAllVariants' => 'false', - 'dependencyFollowSource' => 'false', - 'gpgDisableSign' => 'false', - 'gpgDisableVerify' => 'false', - 'downloadSourcePackages' => 'false', + 'dependencyFollowSuggests' => false, + 'dependencyFollowRecommends' => false, + 'dependencyFollowAllVariants' => false, + 'dependencyFollowSource' => false, + 'gpgDisableSign' => false, + 'gpgDisableVerify' => false, + 'downloadSourcePackages' => false, }), $s3publishpson = hiera('aptly::s3PublishEndpoints', {}), ) { validate_string( - $aptly_version, - $svc_user, - $svc_group, + $version, + $user, + $group, $repo_location, $repo_release, $repo_repos, diff --git a/manifests/install.pp b/manifests/install.pp index 475e94e..de9530a 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -66,7 +66,7 @@ } package { 'aptly': - ensure => "${aptly::version}", + ensure => $aptly::version, } file{ '/etc/init.d/aptly': From ab361f6a888a10339b1219ee697bba9e58cc585c Mon Sep 17 00:00:00 2001 From: Nicolas Brousse Date: Sat, 6 Jun 2015 10:35:08 -0700 Subject: [PATCH 2/5] UP Version to 1.0.1 (hotfix) Change-Id: I81f737c532a8a015c014e35362a894ff920790cd --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index d9af7c4..de9c01b 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "TubeMogul-aptly", - "version": "1.0.0", + "version": "1.0.1", "author": "TubeMogul Inc.", "summary": "Module to manage aptly installations and configurations", "license": "Apache-2.0", From 1ce7e6c4bcd055280654e699809deb1629fde107 Mon Sep 17 00:00:00 2001 From: Nicolas Brousse Date: Sat, 6 Jun 2015 12:49:55 -0700 Subject: [PATCH 3/5] Fix metadata.json for dependencies Change-Id: I843b6790378c53629661665d67f7a5194158ce83 --- metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.json b/metadata.json index de9c01b..a8a8356 100644 --- a/metadata.json +++ b/metadata.json @@ -19,11 +19,11 @@ ], "dependencies": [ { - "name": "puppetlabs-stdlib", + "name": "puppetlabs/stdlib", "version_requirement": ">= 1.0.0" }, { - "name": "puppetlabs-apt", + "name": "puppetlabs/apt", "version_requirement": ">= 2.0.0" } ] From f003cf91b2487d499a8287c62f60cf03c03d66f2 Mon Sep 17 00:00:00 2001 From: Nicolas Brousse Date: Sat, 6 Jun 2015 13:02:38 -0700 Subject: [PATCH 4/5] Update description Change-Id: I31ded2c9092511b93545b384308a0aef2452033e --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index a8a8356..1a3c49c 100644 --- a/metadata.json +++ b/metadata.json @@ -2,7 +2,7 @@ "name": "TubeMogul-aptly", "version": "1.0.1", "author": "TubeMogul Inc.", - "summary": "Module to manage aptly installations and configurations", + "summary": "Module to manage, install, and configure aptly, a Debian repository management tool", "license": "Apache-2.0", "source": "git@github.com:tubemogul/puppet-aptly.git", "project_page": "https://github.com/tubemogul/puppet-aptly", From 2545a87cf0e84713b71981e17a52b4178e97505a Mon Sep 17 00:00:00 2001 From: Nicolas Brousse Date: Sat, 6 Jun 2015 14:08:07 -0700 Subject: [PATCH 5/5] Fix indentation warning Change-Id: Ic628defc5f512b26e2d2c1bd2016ebd69349507b --- manifests/install.pp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index de9530a..463d876 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -42,16 +42,16 @@ include 'apt' apt::source { 'aptly': - location => $aptly::repo_location, - release => $aptly::repo_release, - repos => $aptly::repo_repos, - key => { - id => $aptly::repo_key, - server => $aptly::repo_keyserver, + location => $aptly::repo_location, + release => $aptly::repo_release, + repos => $aptly::repo_repos, + key => { + id => $aptly::repo_key, + server => $aptly::repo_keyserver, }, - include => { - src => false, - deb => true, + include => { + src => false, + deb => true, }, }