projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop m68k@buildd.debian.org -> m68k-build@nocrew.org rewrite
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
efde596
..
2172cd2
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-70,12
+70,6
@@
class roles {
if has_role('debian_mirror') {
include roles::debian_mirror
}
if has_role('debian_mirror') {
include roles::debian_mirror
}
- if has_role('ftp.d.o') {
- vsftpd::site { 'ftp':
- ensure => absent,
- root => '/nonexistent',
- }
- }
if has_role('ftp_master') {
include roles::ftp_master
include roles::dakmaster
if has_role('ftp_master') {
include roles::ftp_master
include roles::dakmaster
@@
-102,8
+96,7
@@
class roles {
include roles::security_master
include roles::dakmaster
}
include roles::security_master
include roles::dakmaster
}
- $zz = has_role('security_mirror')
- notice("Has security mirror role? '${zz}'")
+
if has_role('security_mirror') {
include roles::security_mirror
}
if has_role('security_mirror') {
include roles::security_mirror
}
@@
-284,7
+277,7
@@
class roles {
include roles::dgit_git
}
include roles::dgit_git
}
- if $::hostname in [lw01, lw02, lw03, lw04] {
+ if $::hostname in [lw01, lw02, lw03, lw04
, lw09, lw10
] {
include roles::snapshot
}
include roles::snapshot
}
@@
-377,4
+370,8
@@
class roles {
if has_role('debconf_wafer') {
include roles::debconf_wafer
}
if has_role('debconf_wafer') {
include roles::debconf_wafer
}
+
+ if has_role('cdbuilder_local_mirror') {
+ include roles::cdbuilder_local_mirror
+ }
}
}