aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-02-18 15:32:21 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-02-18 19:30:18 +0100
commit1dca26e507d12b9a38e8740e2c310c8bee4e173c (patch)
tree99e1bf661978acd258e98dc15d9546a5a097ade7
parent76a321e1b7da9f122f35a9722d9f8f331b06f8aa (diff)
downloadPuppet-1dca26e507d12b9a38e8740e2c310c8bee4e173c.tar.gz
Puppet-1dca26e507d12b9a38e8740e2c310c8bee4e173c.tar.zst
Puppet-1dca26e507d12b9a38e8740e2c310c8bee4e173c.zip
Fix aura packager
-rw-r--r--modules/aur/manifests/aura.pp4
-rw-r--r--modules/aur/manifests/package.pp4
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/aur/manifests/aura.pp b/modules/aur/manifests/aura.pp
index 1683cf8..3e06f0a 100644
--- a/modules/aur/manifests/aura.pp
+++ b/modules/aur/manifests/aura.pp
@@ -6,6 +6,10 @@ class aur::aura(
6 ensure => "present" 6 ensure => "present"
7 } 7 }
8 8
9 sudo::conf { 'aur-builder':
10 content => "aur-builder ALL=(root) NOPASSWD: /usr/bin/aura *"
11 }
12
9 ensure_packages(['base-devel'], { 'install_options' => '--needed' }) 13 ensure_packages(['base-devel'], { 'install_options' => '--needed' })
10 ensure_packages(['gmp', 'pcre'], { 'install_options' => '--asdeps' }) 14 ensure_packages(['gmp', 'pcre'], { 'install_options' => '--asdeps' })
11 15
diff --git a/modules/aur/manifests/package.pp b/modules/aur/manifests/package.pp
index 2fd346e..5b55f24 100644
--- a/modules/aur/manifests/package.pp
+++ b/modules/aur/manifests/package.pp
@@ -7,7 +7,7 @@ define aur::package (
7 exec { "pacman::aur::install::${name}": 7 exec { "pacman::aur::install::${name}":
8 cwd => "/tmp", 8 cwd => "/tmp",
9 require => Class[aur::aura], 9 require => Class[aur::aura],
10 command => "/usr/bin/aura -A ${name}", 10 command => "/usr/bin/sudo /usr/bin/aura --noconfirm -A ${name}",
11 user => "aur-builder", 11 user => "aur-builder",
12 unless => "/usr/bin/aura -Qk ${name}", 12 unless => "/usr/bin/aura -Qk ${name}",
13 logoutput => 'on_failure', 13 logoutput => 'on_failure',
@@ -18,7 +18,7 @@ define aur::package (
18 exec { "pacman::aur::remove::${name}": 18 exec { "pacman::aur::remove::${name}":
19 cwd => "/tmp", 19 cwd => "/tmp",
20 require => Class[aur::aura], 20 require => Class[aur::aura],
21 command => "/usr/bin/aura -Rs ${name}", 21 command => "/usr/bin/sudo /usr/bin/aura --noconfirm -Rs ${name}",
22 user => "aur-builder", 22 user => "aur-builder",
23 onlyif => "/usr/bin/aura -Qi ${name}", 23 onlyif => "/usr/bin/aura -Qi ${name}",
24 logoutput => 'on_failure', 24 logoutput => 'on_failure',