projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'pkern/master'
[mirror/dsa-puppet.git]
/
modules
/
debian-org
/
misc
/
local.yaml
diff --git
a/modules/debian-org/misc/local.yaml
b/modules/debian-org/misc/local.yaml
index
fa079df
..
709cbd0
100644
(file)
--- a/
modules/debian-org/misc/local.yaml
+++ b/
modules/debian-org/misc/local.yaml
@@
-204,7
+204,6
@@
host_settings:
- goedel.debian.org
- goetz.debian.org
- krenek.debian.org
- goedel.debian.org
- goetz.debian.org
- krenek.debian.org
- - lafayette.debian.org
- lebrun.debian.org
- lucatelli.debian.org
- malo.debian.org
- lebrun.debian.org
- lucatelli.debian.org
- malo.debian.org
@@
-223,6
+222,7
@@
host_settings:
- vitry.debian.org
- voltaire.debian.org
- zandonai.debian.org
- vitry.debian.org
- voltaire.debian.org
- zandonai.debian.org
+ - zee.debian.org
squeeze:
- alkman.debian.org
- arne.debian.org
squeeze:
- alkman.debian.org
- arne.debian.org
@@
-231,6
+231,7
@@
host_settings:
- biber.debian.org
- brahms.debian.org
- byrd.debian.org
- biber.debian.org
- brahms.debian.org
- byrd.debian.org
+ - chopin.debian.org
- cilea.debian.org
- danzi.debian.org
- dijkstra.debian.org
- cilea.debian.org
- danzi.debian.org
- dijkstra.debian.org
@@
-243,6
+244,7
@@
host_settings:
- franck.debian.org
- geo1.debian.org
- geo2.debian.org
- franck.debian.org
- geo1.debian.org
- geo2.debian.org
+ - geo3.debian.org
- heininen.debian.org
- kassia.debian.org
- kaufmann.debian.org
- heininen.debian.org
- kassia.debian.org
- kaufmann.debian.org
@@
-253,6
+255,7
@@
host_settings:
- lotti.debian.org
- luchesi.debian.org
- merikanto.debian.org
- lotti.debian.org
- luchesi.debian.org
- merikanto.debian.org
+ - morricone.debian.org
- murphy.debian.org
- nono.debian.org
- piatti.debian.org
- murphy.debian.org
- nono.debian.org
- piatti.debian.org
@@
-403,7
+406,6
@@
host_settings:
- englund.debian.org
- rautavaara.debian.org
- salieri.debian.org
- englund.debian.org
- rautavaara.debian.org
- salieri.debian.org
+ - widor.debian.org
# reservedaddrs:
# ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
# reservedaddrs:
# ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
----
-