From b3b159384672d3170106c3738e412a79cc09ae79 Mon Sep 17 00:00:00 2001
From: Dennis Hoppe <github@debian-solutions.de>
Date: Mon, 25 May 2020 10:18:50 +0200
Subject: [PATCH] Add parameter user / group for ressource archive

---
 manifests/daemon.pp  | 10 +++++++++-
 manifests/install.pp | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index ce31f8cc5..96021313f 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -96,7 +96,13 @@
           before          => File["/opt/${name}-${version}.${os}-${arch}/${name}"],
         }
       } else {
-        archive { "/tmp/${name}-${version}.${download_extension}":
+        file { "/opt/${name}-${version}.${os}-${arch}":
+          ensure => directory,
+          owner  => $user,
+          group  => $group,
+          mode   => '0755',
+        }
+        -> archive { "/tmp/${name}-${version}.${download_extension}":
           ensure          => present,
           extract         => true,
           extract_path    => $extract_path,
@@ -106,6 +112,8 @@
           cleanup         => true,
           before          => File[$archive_bin_path],
           extract_command => $extract_command,
+          user            => $user,
+          group           => $group,
         }
       }
       file { $archive_bin_path:
diff --git a/manifests/install.pp b/manifests/install.pp
index 739cb43ef..2f9de4a29 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -16,7 +16,13 @@
   }
   case $prometheus::server::install_method {
     'url': {
-      archive { "/tmp/prometheus-${prometheus::server::version}.${prometheus::server::download_extension}":
+      file { "/opt/prometheus-${prometheus::server::version}.${prometheus::server::os}-${prometheus::server::real_arch}":
+        ensure => 'directory',
+        owner  => $prometheus::server::user,
+        group  => $prometheus::server::group,
+        mode   => '0755',
+      }
+      -> archive { "/tmp/prometheus-${prometheus::server::version}.${prometheus::server::download_extension}":
         ensure          => present,
         extract         => true,
         extract_path    => '/opt',
@@ -25,6 +31,8 @@
         creates         => "/opt/prometheus-${prometheus::server::version}.${prometheus::server::os}-${prometheus::server::real_arch}/prometheus",
         cleanup         => true,
         extract_command => $prometheus::extract_command,
+        user            => $prometheus::server::user,
+        group           => $prometheus::server::group,
       }
       -> file {
         "/opt/prometheus-${prometheus::server::version}.${prometheus::server::os}-${prometheus::server::real_arch}/prometheus":