X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Faur%2Fmanifests%2Faura.pp;h=6bca0480744a6d33b428f36aa9a0f0f7b8e1204c;hb=2365859e723337fff2cdb8e3db209655426825ad;hp=fff988b02f1e86d060b28f6ae8def6855a488f20;hpb=919d772aaa9bb6f298b1d0a433b6b32d15c0410f;p=perso%2FImmae%2FProjets%2FPuppet.git

diff --git a/modules/aur/manifests/aura.pp b/modules/aur/manifests/aura.pp
index fff988b..6bca048 100644
--- a/modules/aur/manifests/aura.pp
+++ b/modules/aur/manifests/aura.pp
@@ -6,28 +6,32 @@ class aur::aura(
     ensure => "present"
   }
 
-  exec { 'pacman-base-devel':
-    command   => '/usr/bin/pacman -S base-devel --needed --noconfirm',
-    unless    => '/usr/bin/pacman -Qo aura',
-    logoutput => 'on_failure',
+  sudo::conf { 'aur-builder':
+    content => "aur-builder ALL=(root) NOPASSWD: /usr/bin/aura *"
   }
 
-  ensure_packages(['gmp', 'pcre', 'abs'], { 'install_options' => '--asdeps' })
+  ensure_packages(['base-devel'], { 'install_options'  => '--needed' })
+  ensure_packages(['gmp', 'pcre'], { 'install_options' => '--asdeps' })
+
+  # aur.sh seems down
+  #$aur_url = "https://aur.sh"
+  #$aur_url = "https://raw.githubusercontent.com/stuartpb/aur.sh/dc2f3fcaa90a4d3d1e8d746160559b5d3123a425/aur.sh"
 
   exec { 'aur::aura':
     cwd       => "/tmp",
     path      => "/usr/bin",
-    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',
+    command   => "curl https://aur.archlinux.org/cgit/aur.git/snapshot/aura-bin.tar.gz | tar xz && cd aura-bin && makepkg aura-bin && mv /tmp/aura-bin/aura-bin-*-x86_64.pkg.tar.xz /tmp/aura-bin-x86_64.pkg.tar.xz && 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':