projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
does this work?
[mirror/dsa-puppet.git]
/
modules
/
debian-org
/
manifests
/
init.pp
diff --git
a/modules/debian-org/manifests/init.pp
b/modules/debian-org/manifests/init.pp
index
9a46d1c
..
da3d184
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-39,7
+39,7
@@
define linux_module ($ensure) {
class debian-org {
class debian-org {
- $debianadmin = [ "debian-archive-debian-samhain-reports@master.debian.org", "debian-admin@ftbfs.de", "weasel@debian.org", "steve@lobefin.net" ]
+ $debianadmin = [ "debian-archive-debian-samhain-reports@master.debian.org", "debian-admin@ftbfs.de", "weasel@debian.org", "steve@lobefin.net"
, "paravoid@debian.org"
]
package {
"apt-utils": ensure => installed;
"bash-completion": ensure => installed;
package {
"apt-utils": ensure => installed;
"bash-completion": ensure => installed;
@@
-55,6
+55,14
@@
class debian-org {
"rsyslog": ensure => purged;
"sysklogd": ensure => purged;
}
"rsyslog": ensure => purged;
"sysklogd": ensure => purged;
}
+ case $debarchitecture {
+ "armhf":
+ default:
+ file {
+ "/etc/apt/sources.list.d/security.list":
+ content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
+ notify => Exec["apt-get update"];
+ }
file {
"/etc/apt/preferences":
source => "puppet:///modules/debian-org/apt.preferences";
file {
"/etc/apt/preferences":
source => "puppet:///modules/debian-org/apt.preferences";
@@
-64,9
+72,6
@@
class debian-org {
"/etc/apt/sources.list.d/debian.org.list":
content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
notify => Exec["apt-get update"];
"/etc/apt/sources.list.d/debian.org.list":
content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
notify => Exec["apt-get update"];
- "/etc/apt/sources.list.d/security.list":
- content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
- notify => Exec["apt-get update"];
"/etc/apt/sources.list.d/volatile.list":
content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
notify => Exec["apt-get update"];
"/etc/apt/sources.list.d/volatile.list":
content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
notify => Exec["apt-get update"];