projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop doing catalog backups
[mirror/dsa-puppet.git]
/
modules
/
schroot
/
manifests
/
init.pp
diff --git
a/modules/schroot/manifests/init.pp
b/modules/schroot/manifests/init.pp
index
7c5e008
..
ee24dc2
100644
(file)
--- a/
modules/schroot/manifests/init.pp
+++ b/
modules/schroot/manifests/init.pp
@@
-1,4
+1,6
@@
class schroot {
class schroot {
+ $mirror = lookup('apt::sources::debian::location', { 'merge' => { 'strategy' => 'first'}} )
+
package { 'schroot':
ensure => installed,
tag => extra_repo,
package { 'schroot':
ensure => installed,
tag => extra_repo,
@@
-53,7
+55,9
@@
class schroot {
require => Package['schroot'],
}
file { '/etc/schroot/dsa/default-mirror':
require => Package['schroot'],
}
file { '/etc/schroot/dsa/default-mirror':
- content => template('schroot/default-mirror.erb'),
+ content => @("EOT"),
+ $mirror
+ | EOT
}
file { '/etc/schroot/dsa/config':
source => 'puppet:///modules/schroot/schroot-dsa/config',
}
file { '/etc/schroot/dsa/config':
source => 'puppet:///modules/schroot/schroot-dsa/config',