use lwf/remote_file to download

threatstack · Oct 17, 2019 · d5f6a60 · d5f6a60
1 parent ed1cd8f
commit d5f6a60
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -115,6 +115,7 @@
   $disable_auditd          = $::threatstack::params::disable_auditd,
   $disable_auditd_cmd      = $::threatstack::params::disable_auditd_cmd,
   $windows_download_url    = $::threatstack::params::download_url,
+  $windows_tmp_path        = $::threatstack::params::tmp_path,
   $windows_ts_package      = $::threatstack::params::ts_package,
   $windows_install_options = ["TSDEPLOYKEY=${deploy_key}"]
 

diff --git a/manifests/package.pp b/manifests/package.pp
@@ -41,10 +41,17 @@
   # installation and upgrades.
   case $facts['os']['family'] {
   'Windows': {
+    remote_file { 'agent msi download':
+      ensure => present,
+      path   => $::threatstack::windows_tmp_path
+      source => $::threatstack::windows_download_url
+    }
+
     package { $::threatstack::ts_package:
       ensure          => installed,
-      source          => $::threatstack::windows_download_url,
+      source          => $::threatstack::windows_tmp_path
       install_options => $::threatstack::windows_install_options
+      require => Remote_file['agent msi download']
     }
   }
   default: {

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -41,10 +41,10 @@
       $gpg_key            = undef
       $disable_auditd     = false
       $disable_auditd_cmd = undef
-      $windows_base_url   = 'https://pkg.threatstack.com/v2/Windows'
+      $windows_base_url   = "https://pkg.threatstack.com/v2/Windows"
       $windows_pkg_name   = 'Threat+Stack+Cloud+Security+Agent.latest.msi'
       $download_url       = "${windows_base_url}/${windows_pkg_name}"
-      $progdir            = 'C:V\\Program Files\\Threat Stack'
+      $tmp_path           = "C:\\Windows\\Temp\\${windows_pkg_name}"
     }
     'RedHat': {
       $repo_class       = '::threatstack::yum'

diff --git a/metadata.json b/metadata.json
@@ -9,7 +9,8 @@
   "tags": ["threatstack"],
   "dependencies": [
     { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.2.2" },
-    {"name": "puppetlabs/apt", "version_requirement": ">= 6.2.1"}
+    {"name": "puppetlabs/apt", "version_requirement": ">= 6.2.1"},
+    {"name": "lwf/remote_file", "version_requirement": ">= 1.1.3"}
   ],
   "operatingsystem_support": [
     {