Refactor base installation module

3 files changed, 12 insertions, 12 deletions

diff --git a/modules/aur/manifests/aura.pp b/modules/aur/manifests/aura.pp
index 2dbcf39..1683cf8 100644
--- a/modules/aur/manifests/aura.pp
+++ b/modules/aur/manifests/aura.pp
@@ -6,12 +6,7 @@ class aur::aura(
     ensure => "present"
   }
 
-  exec { 'pacman-base-devel':
-    command   => '/usr/bin/pacman -Sy base-devel --needed --noconfirm',
-    unless    => '/usr/bin/pacman -Qo aura',
-    logoutput => 'on_failure',
-  }
-
+  ensure_packages(['base-devel'], { 'install_options'  => '--needed' })
   ensure_packages(['gmp', 'pcre'], { 'install_options' => '--asdeps' })
 
   exec { 'aur::aura':
@@ -20,14 +15,15 @@ class aur::aura(
     command   => 'curl -o /tmp/aur.sh aur.sh && chmod +x /tmp/aur.sh && /tmp/aur.sh aura-bin && mv /tmp/aura-bin/aura-bin-*-x86_64.pkg.tar.xz /tmp/aura-bin-x86_64.pkg.tar.xz && rm /tmp/aur.sh && rm -rf /tmp/aura-bin',
     user      => "aur-builder",
     unless    => '/usr/bin/pacman -Qo aura',
-    require   => Exec['pacman-base-devel'],
+    require   => Package['base-devel'],
     logoutput => 'on_failure',
   }
 
   package { 'aura-bin':
-    ensure => "present",
-    source => "/tmp/aura-bin-x86_64.pkg.tar.xz",
-    notify => Exec['aur::aura::cleanup']
+    ensure  => "present",
+    source  => "/tmp/aura-bin-x86_64.pkg.tar.xz",
+    require => Exec['aur::aura'],
+    notify  => Exec['aur::aura::cleanup']
   }
 
   exec { 'aur::aura::cleanup':
diff --git a/modules/aur/manifests/init.pp b/modules/aur/manifests/init.pp
index cdf9929..8c3faa1 100644
--- a/modules/aur/manifests/init.pp
+++ b/modules/aur/manifests/init.pp
@@ -1,4 +1,4 @@
 class aur {
-  class { 'aur::aura': }
+  contain 'aur::aura'
 }
 
diff --git a/modules/aur/manifests/install.pp b/modules/aur/manifests/package.pp
index 074088e..2fd346e 100644
--- a/modules/aur/manifests/install.pp
+++ b/modules/aur/manifests/package.pp
@@ -1,12 +1,14 @@
-define aur::install (
+define aur::package (
   $ensure = 'present',
 ) {
 
   case $ensure {
     'present': {
       exec { "pacman::aur::install::${name}":
+        cwd       => "/tmp",
         require   => Class[aur::aura],
         command   => "/usr/bin/aura -A ${name}",
+        user      => "aur-builder",
         unless    => "/usr/bin/aura -Qk ${name}",
         logoutput => 'on_failure',
         timeout   => 1800,
@@ -14,8 +16,10 @@ define aur::install (
     }
     'absent': {
       exec { "pacman::aur::remove::${name}":
+        cwd       => "/tmp",
         require   => Class[aur::aura],
         command   => "/usr/bin/aura -Rs ${name}",
+        user      => "aur-builder",
         onlyif    => "/usr/bin/aura -Qi ${name}",
         logoutput => 'on_failure',
       }