Enable arbitrary configuration. Fixes tubemogul#67

syseleven · Nov 15, 2018 · b551cab · b551cab
1 parent 18b1acd
commit b551cab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -11,9 +11,18 @@
     group => $aptly::group,
   }
 
+  $config = {
+    'rootDir'               => $aptly::root_dir,
+    'architectures'         => $aptly::architectures,
+    'ppaDistributorID'      => $aptly::ppa_dist,
+    'ppaCodename'           => $aptly::ppa_codename,
+    'S3PublishEndpoints'    => $aptly::s3_publish_endpoints,
+    'SwiftPublishEndpoints' => $aptly::swift_publish_endpoints,
+  } + $aptly::properties
+
   file { $aptly::config_filepath:
     ensure  => file,
-    content => template('aptly/aptly.conf.erb'),
+    content => to_json_pretty($config),
   }
 
   file { $aptly::root_dir:

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -24,17 +24,7 @@
   $architectures   = [$::architecture]
   $ppa_dist        = 'ubuntu'
   $ppa_codename    = ''
-  $properties      = {
-    'downloadConcurrency'         => 4,
-    'downloadSpeedLimit'          => 0,
-    'dependencyFollowSuggests'    => false,
-    'dependencyFollowRecommends'  => false,
-    'dependencyFollowAllVariants' => false,
-    'dependencyFollowSource'      => false,
-    'gpgDisableSign'              => false,
-    'gpgDisableVerify'            => false,
-    'downloadSourcePackages'      => false,
-    }
+  $properties      = {}
   $s3_publish_endpoints = {}
   $swift_publish_endpoints = {}
   $enable_api           = false

diff --git a/metadata.json b/metadata.json
@@ -25,7 +25,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.0.0 < 5.0.0"
+      "version_requirement": ">= 4.24.0 < 5.0.0"
     },
     {
       "name": "puppetlabs/apt",

diff --git a/templates/aptly.conf.erb b/templates/aptly.conf.erb
@@ -1,9 +1,7 @@
 {
   "rootDir": "<%= scope.lookupvar('aptly::root_dir') -%>",
   "architectures": ["<%= scope.lookupvar('aptly::architectures').join('", "') %>"],
-<% scope.lookupvar('aptly::properties').each do |k, v| -%>
-  "<%= k -%>": <%= v %>,
-<% end -%>
+<%= scope.lookupvar('aptly::properties').to_pson -%>,
   "ppaDistributorID": "<%= scope.lookupvar('aptly::ppa_dist') %>",
   "ppaCodename": "<%= scope.lookupvar('aptly::ppa_codename') %>",
   "S3PublishEndpoints": <%= scope.lookupvar('aptly::s3_publish_endpoints').to_pson %>,