diff options
author | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:23 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:23 +0000 |
commit | b74151bf723df3fcadf24d2f6e00401bb69c1020 (patch) | |
tree | ca67dcadb418e482472167cca393fb4ac5a1b5b3 /modules/buildsystem/templates | |
parent | 31adbee69aa33150bd8016837b85646a948f8ad7 (diff) | |
download | puppet-b74151bf723df3fcadf24d2f6e00401bb69c1020.tar puppet-b74151bf723df3fcadf24d2f6e00401bb69c1020.tar.gz puppet-b74151bf723df3fcadf24d2f6e00401bb69c1020.tar.bz2 puppet-b74151bf723df3fcadf24d2f6e00401bb69c1020.tar.xz puppet-b74151bf723df3fcadf24d2f6e00401bb69c1020.zip |
refactor completely iurt module ( maybe should even be moved out of buildsystem
module, since it tend to be too big )
Diffstat (limited to 'modules/buildsystem/templates')
-rw-r--r-- | modules/buildsystem/templates/iurt/sudoers.iurt | 2 | ||||
-rw-r--r-- | modules/buildsystem/templates/upload.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/buildsystem/templates/iurt/sudoers.iurt b/modules/buildsystem/templates/iurt/sudoers.iurt index 266f301c..408aa92c 100644 --- a/modules/buildsystem/templates/iurt/sudoers.iurt +++ b/modules/buildsystem/templates/iurt/sudoers.iurt @@ -1 +1 @@ -<%= build_login %> ALL = NOPASSWD: /usr/sbin/iurt_root_command +<%= login %> ALL = NOPASSWD: /usr/sbin/iurt_root_command diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf index f4555259..99443831 100644 --- a/modules/buildsystem/templates/upload.conf +++ b/modules/buildsystem/templates/upload.conf @@ -12,7 +12,7 @@ my %nodes = ( x86_64 => [ qw(jonund0 ecosse0 jonund1 ecosse1) ], ); my $repository = "http://repository.<%= domain %>/distrib/"; -my $homedir = "<%= build_home_dir %>"; +my $homedir = "<%= homedir %>"; { bot => { @@ -23,7 +23,7 @@ my $homedir = "<%= build_home_dir %>"; my $node = $_; ($node => { iurt => { - user => '<%= build_login %>', + user => '<%= login %>', # (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind # command => "iurt --copy-srpm --group -v 6 --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository --additional-media -m __MEDIA__ -- file://$homedir/cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__", command => "iurt --copy_srpm --group --rpmmacros \"%distro_section __SECTION__\" --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__", |