Merge pull request #2 from orieg/hotfix/1.0.1

Fix Puppet-lint Warning and Errors. Issue #1.
tubemogul · Jun 6, 2015 · 8b39372 · 8b39372
2 parents a7dcef8 + 2545a87
commit 8b39372
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git 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
@@ -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,
           },
         }
 
@@ -66,7 +66,7 @@
   }
 
   package { 'aptly':
-    ensure   => "${aptly::version}",
+    ensure   => $aptly::version,
   }
 
   file{ '/etc/init.d/aptly':

diff --git a/metadata.json b/metadata.json
@@ -1,8 +1,8 @@
 {
   "name": "TubeMogul-aptly",
-  "version": "1.0.0",
+  "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",
@@ -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"
     }
   ]