aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-02-26 23:29:47 +0000
committerNicolas Vigier <boklm@mageia.org>2011-02-26 23:29:47 +0000
commit13e7a21f3a6f8172537d4983499cb8c8a2208df8 (patch)
treea53309b622a86987aab79a9f5ea16000e031dc11
parentd9040fa397db500a3f0e51ff2fe3a6395620d965 (diff)
downloadpuppet-13e7a21f3a6f8172537d4983499cb8c8a2208df8.tar
puppet-13e7a21f3a6f8172537d4983499cb8c8a2208df8.tar.gz
puppet-13e7a21f3a6f8172537d4983499cb8c8a2208df8.tar.bz2
puppet-13e7a21f3a6f8172537d4983499cb8c8a2208df8.tar.xz
puppet-13e7a21f3a6f8172537d4983499cb8c8a2208df8.zip
add directory for archived packages
-rw-r--r--modules/buildsystem/manifests/init.pp7
-rw-r--r--modules/buildsystem/templates/submit-upload.conf2
2 files changed, 8 insertions, 1 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index b17c12c2..0d5aace0 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -5,6 +5,7 @@ class buildsystem {
$build_home_dir = "/home/$build_login"
$sched_login = "schedbot"
$sched_home_dir = "/var/lib/$sched_login"
+ $packages_archivedir = "$sched_home_dir/old"
$sign_login = "signbot"
$sign_home_dir = "/var/lib/$sign_login"
$sign_keydir = "$sign_home_dir/keys"
@@ -135,6 +136,12 @@ class buildsystem {
content => template("buildsystem/repsys.conf")
}
+ file { "$packages_archivedir":
+ ensure => "directory",
+ owner => $sched_login,
+ require => File[$sched_home_dir],
+ }
+
file { "$sched_home_dir/repsys":
ensure => "directory",
owner => $sched_login,
diff --git a/modules/buildsystem/templates/submit-upload.conf b/modules/buildsystem/templates/submit-upload.conf
index 7ec4729e..5eef2c07 100644
--- a/modules/buildsystem/templates/submit-upload.conf
+++ b/modules/buildsystem/templates/submit-upload.conf
@@ -10,7 +10,7 @@ repository:
options:
install_root: <%= repository_root %>/distrib
upload_root: ${home}/uploads/
- archive_root: ${home}/old/
+ archive_root: <%= packages_archivedir %>
upload_state: queue
queue: queue
noarch: i586