refactor

2 files changed, 8 insertions, 4 deletions

diff --git a/modules/package/manifests/makepkg.pp b/modules/package/manifests/makepkg.pp
index 2373abf..7692b17 100644
--- a/modules/package/manifests/makepkg.pp
+++ b/modules/package/manifests/makepkg.pp
@@ -1,4 +1,4 @@
-define package::makepkg($ensure, $asdeps=false) {
+define package::makepkg($ensure, $build_user, $asdeps=false) {
   if $asdeps {
     $extra_cmdline = " --asdeps"
   }
@@ -13,15 +13,15 @@ define package::makepkg($ensure, $asdeps=false) {
         command => "
           cd /tmp
           rm -rf 'makepkg-$name'
-          su doy -c 'git clone https://aur.archlinux.org/$name.git makepkg-$name'
+          su $build_user -c 'git clone https://aur.archlinux.org/$name.git makepkg-$name'
           cd 'makepkg-$name'
-          su doy -c makepkg
+          su $build_user -c makepkg
           pacman -U --noconfirm --needed $extra_cmdline $name-*.pkg.tar.xz
         ",
         unless => "pacman -Q $name > /dev/null 2>&1",
         path => "/usr/bin",
         require => [
-          Tozt::User["doy"],
+          Tozt::User[$build_user],
           Package["git"],
           Package["pkgconf"],
         ];
diff --git a/modules/tozt/manifests/users.pp b/modules/tozt/manifests/users.pp
index b07373b..8576f35 100644
--- a/modules/tozt/manifests/users.pp
+++ b/modules/tozt/manifests/users.pp
@@ -8,4 +8,8 @@ class tozt::users {
     extra_groups => ['wheel'],
     homedir_mode => '0701';
   }
+
+  Package::Makepkg {
+    build_user => 'doy',
+  }
 }