projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of buildd-{lenny,squeeze,wheezy} shares on security-master rsync
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
syncproxy.pp
diff --git
a/modules/roles/manifests/syncproxy.pp
b/modules/roles/manifests/syncproxy.pp
index
20c3320
..
510e1e9
100644
(file)
--- a/
modules/roles/manifests/syncproxy.pp
+++ b/
modules/roles/manifests/syncproxy.pp
@@
-1,14
+1,18
@@
class roles::syncproxy {
rsync::site { 'syncproxy':
class roles::syncproxy {
rsync::site { 'syncproxy':
-
source => 'puppet:///modules/roles/syncproxy/rsyncd.conf'
,
+
content => template('roles/syncproxy/rsyncd.conf.erb')
,
bind => $::hostname ? {
'milanollo' => '5.153.231.9',
bind => $::hostname ? {
'milanollo' => '5.153.231.9',
+ 'mirror-isc' => '149.20.20.21',
+ 'mirror-umn' => '128.101.240.216',
default => ''
default => ''
- }
+ }
,
bind6 => $::hostname ? {
'milanollo' => '2001:41c8:1000:21::21:9',
bind6 => $::hostname ? {
'milanollo' => '2001:41c8:1000:21::21:9',
+ 'mirror-isc' => '2001:4f8:8:36::1deb:21',
+ 'mirror-umn' => '2607:ea00:101:3c0b::1deb:216',
default => ''
default => ''
- }
+ }
,
}
file { '/etc/rsyncd':
}
file { '/etc/rsyncd':
@@
-18,6
+22,6
@@
class roles::syncproxy {
file { '/etc/rsyncd/debian.secrets':
owner => 'root',
group => 'mirroradm',
file { '/etc/rsyncd/debian.secrets':
owner => 'root',
group => 'mirroradm',
- mode => 066
4
,
+ mode => 066
0
,
}
}
}
}