projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
382b968
)
Revert "try to order these a bit"
author
Stephen Gran
<steve@lobefin.net>
Fri, 27 Apr 2012 19:20:12 +0000
(20:20 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Fri, 27 Apr 2012 19:20:12 +0000
(20:20 +0100)
This reverts commit
382b96856d6c214d79ae17d7f3b919ed7ae99bf8
.
manifests/site.pp
patch
|
blob
|
history
modules/buildd/manifests/init.pp
patch
|
blob
|
history
modules/debian-org/manifests/init.pp
patch
|
blob
|
history
modules/site/manifests/aptrepo.pp
patch
|
blob
|
history
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
9c714a5
..
3aa5990
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-1,6
+1,5
@@
Package {
Package {
- require => File['/etc/apt/apt.conf.d/local-recommends'],
- stage => deploy_infra
+ require => File['/etc/apt/apt.conf.d/local-recommends']
}
File {
}
File {
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
6bd381e
..
1de4f33
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-7,16
+7,13
@@
class buildd {
package { 'schroot': ensure => held }
}
package { 'schroot': ensure => held }
}
- package { 'apt-transport-https':
- ensure => installed,
- stage => setup,
- }
package { [
'sbuild',
package { [
'sbuild',
+ 'apt-transport-https',
'debootstrap',
'dupload'
]:
'debootstrap',
'dupload'
]:
- ensure => installed
+
ensure => installed
}
site::linux_module { 'dm_snapshot': }
}
site::linux_module { 'dm_snapshot': }
diff --git
a/modules/debian-org/manifests/init.pp
b/modules/debian-org/manifests/init.pp
index
c3488e5
..
912cfd6
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-179,7
+179,6
@@
class debian-org {
exec { 'apt-get update':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
exec { 'apt-get update':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
- stage => setup_infra,
refreshonly => true,
}
refreshonly => true,
}
diff --git
a/modules/site/manifests/aptrepo.pp
b/modules/site/manifests/aptrepo.pp
index
b71c5fa
..
d0e34ec
100644
(file)
--- a/
modules/site/manifests/aptrepo.pp
+++ b/
modules/site/manifests/aptrepo.pp
@@
-1,18
+1,17
@@
-define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
+define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present, $require = []) {
+
case $ensure {
present: {
if $key {
exec { "apt-key-update-${name}":
command => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
case $ensure {
present: {
if $key {
exec { "apt-key-update-${name}":
command => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
- stage => setup,
refreshonly => true,
}
file { "/etc/apt/trusted-keys.d/${name}.asc":
source => $key,
mode => '0664',
refreshonly => true,
}
file { "/etc/apt/trusted-keys.d/${name}.asc":
source => $key,
mode => '0664',
- stage => setup,
notify => Exec["apt-key-update-${name}"]
}
}
notify => Exec["apt-key-update-${name}"]
}
}
@@
-21,23
+20,19
@@
define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
if ($keyid) and ($key) {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
if ($keyid) and ($key) {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
- stage => setup,
notify => Exec["apt-key-del-${keyid}"]
}
exec { "apt-key-del-${keyid}":
command => "apt-key del ${keyid}",
notify => Exec["apt-key-del-${keyid}"]
}
exec { "apt-key-del-${keyid}":
command => "apt-key del ${keyid}",
- stage => setup,
refreshonly => true,
}
} elsif $key {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
refreshonly => true,
}
} elsif $key {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
- stage => setup,
}
} elsif $keyid {
exec { "apt-key-del-${keyid}":
}
} elsif $keyid {
exec { "apt-key-del-${keyid}":
- command => "apt-key del ${keyid}",
- stage => setup,
+ command => "apt-key del ${keyid}",
}
}
}
}
}
}
@@
-54,13
+49,15
@@
define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
file { "/etc/apt/sources.list.d/${name}.list":
ensure => $ensure,
content => template($template),
file { "/etc/apt/sources.list.d/${name}.list":
ensure => $ensure,
content => template($template),
- notify => Exec['apt-get update'],
+ notify => Exec['apt-get update'],
+ require => $require,
}
} else {
file { "/etc/apt/sources.list.d/${name}.list":
}
} else {
file { "/etc/apt/sources.list.d/${name}.list":
- ensure => $ensure,
- source => $config,
- notify => Exec['apt-get update'],
+ ensure => $ensure,
+ source => $config,
+ notify => Exec['apt-get update'],
+ require => $require,
}
}
}
}
}
}