From: Tom Hughes Date: Wed, 18 Jul 2018 21:28:48 +0000 (+0100) Subject: Update configuration for move from Imperial to Amsterdam X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/fba89b0d71a9dd87d0c3c57fb2f84263c3b36a14?hp=bf224da116c5a68ed9317a2433dfffd99b992ac4 Update configuration for move from Imperial to Amsterdam --- diff --git a/README.md b/README.md index 4020d2e92..50b3a7acf 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ All our servers are [named after dragons](https://wiki.openstreetmap.org/wiki/Se Covers anything specific to a certain piece of hardware, like a motherboard, that could apply to multiple machines. -## Location-specific roles (e.g. [ic.rb](roles/ic.rb)) +## Location-specific roles (e.g. [ams.rb](roles/ams.rb)) These form a hierarchy of datacentres, organisations, and countries where our servers are located. diff --git a/cookbooks/bind/templates/default/db.10.erb b/cookbooks/bind/templates/default/db.10.erb index 2c1e5e5d9..ce6c0a05e 100644 --- a/cookbooks/bind/templates/default/db.10.erb +++ b/cookbooks/bind/templates/default/db.10.erb @@ -2,7 +2,7 @@ $TTL 604800 @ IN SOA <%= node[:fdqn] %>. root.openstreetmap.org. ( - 2018062401 ; Serial + 2018072501 ; Serial 604800 ; Refresh 86400 ; Retry 2419200 ; Expire @@ -81,3 +81,29 @@ $TTL 604800 40.33.0 IN PTR katla.oob.openstreetmap.org. 41.33.0 IN PTR thorn-04.oob.openstreetmap.org. 42.33.0 IN PTR thorn-05.oob.openstreetmap.org. + +1.48.0 IN PTR dulcy.ams.openstreetmap.org. +2.48.0 IN PTR ironbelly.ams.openstreetmap.org. +3.48.0 IN PTR orm.ams.openstreetmap.org. +4.48.0 IN PTR ouroboros.ams.openstreetmap.org. +5.48.0 IN PTR ramoth.ams.openstreetmap.org. +6.48.0 IN PTR spike-01.ams.openstreetmap.org. +7.48.0 IN PTR spike-02.ams.openstreetmap.org. +8.48.0 IN PTR spike-03.ams.openstreetmap.org. +50.48.0 IN PTR karm.ams.openstreetmap.org. +51.48.0 IN PTR thorn-01.ams.openstreetmap.org. +52.48.0 IN PTR thorn-02.ams.openstreetmap.org. +53.48.0 IN PTR thorn-03.ams.openstreetmap.org. + +1.49.0 IN PTR dulcy.oob.openstreetmap.org. +2.49.0 IN PTR ironbelly.oob.openstreetmap.org. +3.49.0 IN PTR orm.oob.openstreetmap.org. +4.49.0 IN PTR ouroboros.oob.openstreetmap.org. +5.49.0 IN PTR ramoth.oob.openstreetmap.org. +6.49.0 IN PTR spike-01.oob.openstreetmap.org. +7.49.0 IN PTR spike-02.oob.openstreetmap.org. +8.49.0 IN PTR spike-03.oob.openstreetmap.org. +50.49.0 IN PTR karm.oob.openstreetmap.org. +51.49.0 IN PTR thorn-01.oob.openstreetmap.org. +52.49.0 IN PTR thorn-02.oob.openstreetmap.org. +53.49.0 IN PTR thorn-03.oob.openstreetmap.org. diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb index b650d7e18..1f5ed8ff0 100644 --- a/cookbooks/networking/templates/default/shorewall-zones.erb +++ b/cookbooks/networking/templates/default/shorewall-zones.erb @@ -6,7 +6,7 @@ loc <%= @type %> net <%= @type %> osm:net <%= @type %> ucl:osm <%= @type %> -ic:osm <%= @type %> +ams:osm <%= @type %> bm:osm <%= @type %> ts:osm <%= @type %> yx:osm <%= @type %> diff --git a/cookbooks/nfs/templates/default/exports.erb b/cookbooks/nfs/templates/default/exports.erb index f0f0a7688..7c5c2a526 100644 --- a/cookbooks/nfs/templates/default/exports.erb +++ b/cookbooks/nfs/templates/default/exports.erb @@ -5,4 +5,4 @@ <%= directory -%> -sync,subtree_check,<%= options %> <%= address %> <% end -%> <% end -%> -/store/planet -sync,subtree_check,rw 146.179.159.168 146.179.159.170 +/store/planet -sync,subtree_check,rw 10.0.48.50 10.0.48.5 diff --git a/cookbooks/openssh/templates/default/ssh_known_hosts.erb b/cookbooks/openssh/templates/default/ssh_known_hosts.erb index 8a54f552b..23bf87bae 100644 --- a/cookbooks/openssh/templates/default/ssh_known_hosts.erb +++ b/cookbooks/openssh/templates/default/ssh_known_hosts.erb @@ -33,16 +33,16 @@ yevaud.oob,yevaud.oob.openstreetmap.org,10.0.1.15 ssh-dss AAAAB3NzaC1kc3MAAACBAL clifford.oob,clifford.oob.openstreetmap.org,10.0.1.17 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCsCrNQ+QQg2UUGhBpgjlLAF4gI48VDGmcF9prulYDxduyGJIrqhOjQtKLjNksMr8TEblmJsI4JzPf1lY1rVL3Q/aZWJD5X4Q0DgEtNzfinI9JAy77JASj1osBPU2RfWSvK9C2TnEoXHxuyGKMw9iuuPLppNMjZ103PYprQeAXi1w== katla.oob,katla.oob.openstreetmap.org,10.0.33.40 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgwCIJ+bSxbMsr6wurBXYkeqoznHnJT4zrN7nHtajgs5CJLIiWO+Eq/Lp+egz6Irxwk3v+kbfKW9RUum5fOMfkWFwaQxP41Cz5RbMmu5Jsm4MQKr4PPVxbLbPk75OeVgo+nfkzBupsBuYGMp/GCpjTJ8rusPmYxzWBek4amKL5udfA9Ld katla.oob,katla.oob.openstreetmap.org,10.0.33.40 ssh-dss AAAAB3NzaC1kc3MAAACBAP4oHi33lAVyP8zjoRZe6kxcZGJi1JOgF1vpZqEsxA97yCaLGVjc2cdxi16namqdJ/DgQaRpGRM+chP6AgGN9FD8Z6Wfskm+2sghPpcGRUkr7u6mM7WlJ0xQehD4LDcxFEpZKxtalf6TlxXn9cO0VaL9NNVrpU34c2Pqxl7wg/QnAAAAFQCB10EQxYDOnsxN2xrSHEbmgA3K0wAAAIAWN0b4KREM6Uc6FVkRtOjkiAR8FWmCg8nNQaqlKIPlM4hsrIcPC5yZfc7BzamQSy4PpHNGZG64CkYr8tn8LGWouHVKKbeFOWEXIBsRBSf1NNaYI7cS7WPnGVOmkt6yHvWwPlDcVO8FpPUL9pA7kf6iCuQNdD/MyOBHdbVoU9LcNAAAAIEAsXBb+3EZhsRAYL9Jm22PsrsW2o/hO7aomMeEXvVGG8Wuy77lqmcIvlyW3zhHBs7ubI9TZz1XDsgLK9giCkmqCyKmUsTXGsu9e4veOq+sgvXdbhoBMVi90IFsPLPUdPN5mfovBDHkwi60VtDwOLAX368pFfBfSA50CZWfhwUu26E= -karm.oob,karm.oob.openstreetmap.org,146.179.159.173 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgwC0NwmVi6Fj/55PE+E/60m55gsjY0HaHpSTO2Cr3wuaTrvT4rMCbORaAtIqvp/j70MKZqSS7f1wztnm9fP/54viWWbgslMZ8GaSUHDDkoH07eznggIJ5P3wHcaK/P1sKe6JTj/dbCf/FMvTT2nrA+kIlY5q3UPQ7q1apSYE9lUjF0f3 -karm.oob,karm.oob.openstreetmap.org,146.179.159.173 ssh-dss AAAAB3NzaC1kc3MAAACBAKrOVh4QX2hflIkjfxfN/+K9CGqZWO/Mk2P84cxo9RljimbpC3PUrMHgNlRNw4lilrX8ijsKlIQaYHHi0lZ3gvmOxsOVQlVLHIoTtWCp+kok/X+mSZM7YjQ9SbC+82GuyQryOAD9nBRDfNJhcMp5Wqm18EtVmhYTnZsHhCHS/pddAAAAFQDbFNJM36iizA8rRhhu/mzCWBZXCQAAAIAne/vY2EVf07qtSKQKgeRSN+juWV7jXSkHG9ajM9JHTJDlI/S0Q0x1ScNOGiS1kZZVXqj1g4zYZNNJT3bqk4Vq0/lQRO2xsRB85fyVCmxIrCW82FPVfOcdZUd2Wp/gJhKQvOOsq4QaNpmFqmLUNvNe1nHWc1T8zCRAhThNWDc0jQAAAIBOuqVG2Wm046eQAx0Gfk3jaE+8L98X5HRqHhHsxLiWa3kr2LrJDKIDSpcEi8eQ5WRiemP8tj5eEaYwoa1uv5VF51dQfAqM05+dlNaySygbiLy43eMjCFNB0tRdXJtO7dBs5pxUfGgmaI/vF6/rEdoOXAzKtwTNUYcCK/evO5lunA== -orm.oob,orm.oob.openstreetmap.org,146.179.159.175 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAn68BVVd15SyHq1vdXYZukNkoxBPlNBgA8gcaXjlQg917A8gXcHaJQ04xSwt/jkbbvELNuvYDuw0EZAqQQHG1vYsXffg8bYrEq/WUs2+oc1O6iiR3xrzgDWAdefEVk+Fk8TXRGI3dy6IBpFoQ6ywvNCbFvVcB41FLRtBGOWdJFZM= -ouroboros.oob,ouroboros.oob.openstreetmap.org,146.179.159.178 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC0b16+oF2QHYj+iIS2YT5VnH8KfdYckm1ujYSo5WitGONMqhN872W6krqYbW7GjFvrJ2d7GbNaY/3VeVURLumgWBnit77bExpga++/QYsE90DSoiQMeUT0Q4QuPWXcTIzAcGesda4VtQkTRBTt1UlmdEGBP3eDAqL2GoW4DBPCiQ== -spike-02.oob,spike-02.oob.openstreetmap.org,146.179.159.180 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDJfkctRhGPVyPY18EVcegsABPTC7PsCA6Pt2UOkkzANJKkwrOUJyn5GqgJYHkOb3hWqPlS89zdlV9kXlvTdUZ8QKw4xys/5H5+CWwbag0h1EpDR9S0xO9gIgX5DgyB5Y7oNS8o9AolF+hgyUdmBYO3ff+h7eu1PnqBn8TfquqVcw== -ramoth.oob,ramoth.oob.openstreetmap.org,146.179.159.181 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgni5YTvVrAo/wzxDRLAL4ZXJY2Egt8XXlIK72zmw6X0lCqrRGwZaBYVOBfnAz4ebC+3uRVUYVzu78DT06wkrqfvzbVekccwAFLAnbWzL/2NSExdvJIbe03bLxJdDCoZEZ15+jTMS3DnuvUwITwnbbhdkA60QP8RuES4U/bPoSzjPp9k= -ramoth.oob,ramoth.oob.openstreetmap.org,146.179.159.181 ssh-dss AAAAB3NzaC1kc3MAAACBALRCRi3NY07WEWUGYFUftD/wNB6untreAjuujJY77ZYghV058QnIx8hu/1hcyXKdHTjI5d8qzDDj5ypG+iQ8Td4lHjHKySqUBvWBp6Uy5TC0Pa2R/mBt+S1Vilg3uvubW7uYpq8m3VI43fzbURfGKnV1lXLyjP/hyafgnndlfAZjAAAAFQC9N/IJEeMEEpyw4cL7JbPS2NhrFQAAAIAmYsZHe0TLlNGa9xOhjnEneU1U88ZxwXJQCRP/Vo2CWpEMC7GPNI3TkZjvPyH8S3s7u3pcDXR8Mm7WwbJr7ySFx1PkkXWxnZiSoGwbectXApuQor3+Mpjkdtvl1uxDAt91/mGyK4ytKoz9uIeUijbHRZfemV6rB09tvgUg4BlPtwAAAIBQyeIyMduHKtDbk9FZ5N9F7bVG1NFg9NvWf/06J/8g5l32iFaxDZ43bpymVWSce1Jm3stV/G5wopCETeYFuOnb1TzmQLoqNLixU76QWDehMDAKADurHmzf1JbCuErwTGMeoCbP8o1G9LlKwBXppHrZPBMDj7/+N5v3CGiZ4hsFlw== -grisu.oob,grisu.oob.openstreetmap.org,146.179.159.180 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDTEivJ/aHG2g7TVGEXJUDcOrbQKMOwYEzWiKvMTsftxOKqMW2uKzCZDkW3BNXIBiAXoswaqK0qkh519i56tY9ff7XjH5YoYbPyWwbhMPoBlIc6wBF+uMV3dBRrb7iRe0HFhpl/XsTo5vw8x+5T/ITrlvI8T7ZfE6uTLxKFDxYOiQ== -thorn-03.oob,thorn-03.oob.openstreetmap.org,146.179.159.183 ssh-dss AAAAB3NzaC1kc3MAAACBAKZf6qtRHGHjPfOP3drwO1m28l4fpN5X5c8ArkeKhV3aTzY404uwCsSvfYQUw/s24E+989MWZxLUO0Ib+nV+hWlK0nxI85bQPIvOjaWNtbggOfNdz4VyNcLxxzsiJqNhQpGQ3LW2zQ7fsP9pM5ALAs7MDOaSdNja58aUgEMY1ta5AAAAFQC1r9L5Mkax780fOnwkDB6eIaNjCwAAAH97vSxdyRel4IucL4Ckn7Y/zVwFeLpwHiVP41MN7dO2aApuWvsygLU/FUAouv/3PRug/bAAS56w2/JLKVvyo1aRPNHAvgPFEDodqLc+dnC1bXFu1VR69ntQYTEe6iReLlwzeEPLwTW5ucGHddXVbP2jG3R+JEmGGt87P3JxicCjAAAAgBrDGGrP1jST/axY9UTs1q0ljkET93/vIitbc/C87pe08ccQUL/PUn0GTrVhXps2Q2nfg2IuI32vYYy0lNKXD53NOpu5G0ZxEB6BYxwejwD5YLZhJQD1mtZ5JvyAPeeWfZa15ZRoI0qzg9RxzB5bp4cRKtHxFcGRAj1jjHkN+80x -thorn-02.oob,thorn-02.oob.openstreetmap.org,146.179.159.184 ssh-dss AAAAB3NzaC1kc3MAAACBAKZf6qtRHGHjPfOP3drwO1m28l4fpN5X5c8ArkeKhV3aTzY404uwCsSvfYQUw/s24E+989MWZxLUO0Ib+nV+hWlK0nxI85bQPIvOjaWNtbggOfNdz4VyNcLxxzsiJqNhQpGQ3LW2zQ7fsP9pM5ALAs7MDOaSdNja58aUgEMY1ta5AAAAFQC1r9L5Mkax780fOnwkDB6eIaNjCwAAAH97vSxdyRel4IucL4Ckn7Y/zVwFeLpwHiVP41MN7dO2aApuWvsygLU/FUAouv/3PRug/bAAS56w2/JLKVvyo1aRPNHAvgPFEDodqLc+dnC1bXFu1VR69ntQYTEe6iReLlwzeEPLwTW5ucGHddXVbP2jG3R+JEmGGt87P3JxicCjAAAAgEitEET7IzW9j0lgxcgXT9JgzDR/cbQdlYSwV6rcWvHW9cz1ArWmJ6BY2AJ6CG3wTznVbHPupiFKf0jvkX0omKu8K90f5FJc2/BkUP4aG72YmAoPVe4bflGykvKJE9Rd4BDyPWGqI955Okp3VGCEKXBS/fwnoOZlei+9ex334hK2 -thorn-01.oob,thorn-01.oob.openstreetmap.org,146.179.159.185 ssh-dss AAAAB3NzaC1kc3MAAACBAKZf6qtRHGHjPfOP3drwO1m28l4fpN5X5c8ArkeKhV3aTzY404uwCsSvfYQUw/s24E+989MWZxLUO0Ib+nV+hWlK0nxI85bQPIvOjaWNtbggOfNdz4VyNcLxxzsiJqNhQpGQ3LW2zQ7fsP9pM5ALAs7MDOaSdNja58aUgEMY1ta5AAAAFQC1r9L5Mkax780fOnwkDB6eIaNjCwAAAH97vSxdyRel4IucL4Ckn7Y/zVwFeLpwHiVP41MN7dO2aApuWvsygLU/FUAouv/3PRug/bAAS56w2/JLKVvyo1aRPNHAvgPFEDodqLc+dnC1bXFu1VR69ntQYTEe6iReLlwzeEPLwTW5ucGHddXVbP2jG3R+JEmGGt87P3JxicCjAAAAgQCFBaTPsbNtWlUSsGnRzObp3NVC6MOro10p4qSXB0kwAB+hQx/IrIH8BjduR+b6Uv2cm/UMnGRzS/1lGYe15cSs0V/IOUyXdVeX+jB0TXzS4hTqclGKJ0Ay2WEsgW27IdPxIjQg/W77s9AZ2UlyEtT7gK2oergD60yUvRfLLJioYA== -spike-03.oob,spike-03.oob.openstreetmap.org,146.179.159.187 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCvTY6CDpJgBcU5T0l7Hmn6UkLZw1d0EQEPlcQM1UvLfdSKayVR79Yl31eVWFbA+R+QqQ8LKcmzx6ztWPuemW3Ym/gZ7NNYH10y1Rw9LywWhVnFOjKIBUVJmjdiuxftyCPveHu672k1KJ+bApXlA3/oMBmtCckr2Wod2qJDx7JIeQ== -spike-01.oob,spike-01.oob.openstreetmap.org,146.179.159.188 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDHhi90mKvMe+FL1pdzBPWUfC+a0ckv31Qou7Yby1Kn9xhrR5oHvyoT4bc/xPrYvaxRZUHWn+J66ZdylhyfCZf6/5g8xghJoYVAZJn9yCV0R7xw2fzHCgue3iS/Yrep2V3DRaXt/zy+PCe7wZX7InLLtp1rV/Vx2xG3lV91OGa4Zw== +karm.oob,karm.oob.openstreetmap.org,10.0.49.50 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgwC0NwmVi6Fj/55PE+E/60m55gsjY0HaHpSTO2Cr3wuaTrvT4rMCbORaAtIqvp/j70MKZqSS7f1wztnm9fP/54viWWbgslMZ8GaSUHDDkoH07eznggIJ5P3wHcaK/P1sKe6JTj/dbCf/FMvTT2nrA+kIlY5q3UPQ7q1apSYE9lUjF0f3 +karm.oob,karm.oob.openstreetmap.org,10.0.49.50 ssh-dss AAAAB3NzaC1kc3MAAACBAKrOVh4QX2hflIkjfxfN/+K9CGqZWO/Mk2P84cxo9RljimbpC3PUrMHgNlRNw4lilrX8ijsKlIQaYHHi0lZ3gvmOxsOVQlVLHIoTtWCp+kok/X+mSZM7YjQ9SbC+82GuyQryOAD9nBRDfNJhcMp5Wqm18EtVmhYTnZsHhCHS/pddAAAAFQDbFNJM36iizA8rRhhu/mzCWBZXCQAAAIAne/vY2EVf07qtSKQKgeRSN+juWV7jXSkHG9ajM9JHTJDlI/S0Q0x1ScNOGiS1kZZVXqj1g4zYZNNJT3bqk4Vq0/lQRO2xsRB85fyVCmxIrCW82FPVfOcdZUd2Wp/gJhKQvOOsq4QaNpmFqmLUNvNe1nHWc1T8zCRAhThNWDc0jQAAAIBOuqVG2Wm046eQAx0Gfk3jaE+8L98X5HRqHhHsxLiWa3kr2LrJDKIDSpcEi8eQ5WRiemP8tj5eEaYwoa1uv5VF51dQfAqM05+dlNaySygbiLy43eMjCFNB0tRdXJtO7dBs5pxUfGgmaI/vF6/rEdoOXAzKtwTNUYcCK/evO5lunA== +orm.oob,orm.oob.openstreetmap.org,10.0.49.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAn68BVVd15SyHq1vdXYZukNkoxBPlNBgA8gcaXjlQg917A8gXcHaJQ04xSwt/jkbbvELNuvYDuw0EZAqQQHG1vYsXffg8bYrEq/WUs2+oc1O6iiR3xrzgDWAdefEVk+Fk8TXRGI3dy6IBpFoQ6ywvNCbFvVcB41FLRtBGOWdJFZM= +ouroboros.oob,ouroboros.oob.openstreetmap.org,10.0.49.4 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC0b16+oF2QHYj+iIS2YT5VnH8KfdYckm1ujYSo5WitGONMqhN872W6krqYbW7GjFvrJ2d7GbNaY/3VeVURLumgWBnit77bExpga++/QYsE90DSoiQMeUT0Q4QuPWXcTIzAcGesda4VtQkTRBTt1UlmdEGBP3eDAqL2GoW4DBPCiQ== +spike-02.oob,spike-02.oob.openstreetmap.org,10.0.49.7 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDJfkctRhGPVyPY18EVcegsABPTC7PsCA6Pt2UOkkzANJKkwrOUJyn5GqgJYHkOb3hWqPlS89zdlV9kXlvTdUZ8QKw4xys/5H5+CWwbag0h1EpDR9S0xO9gIgX5DgyB5Y7oNS8o9AolF+hgyUdmBYO3ff+h7eu1PnqBn8TfquqVcw== +ramoth.oob,ramoth.oob.openstreetmap.org,10.0.49.5 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgni5YTvVrAo/wzxDRLAL4ZXJY2Egt8XXlIK72zmw6X0lCqrRGwZaBYVOBfnAz4ebC+3uRVUYVzu78DT06wkrqfvzbVekccwAFLAnbWzL/2NSExdvJIbe03bLxJdDCoZEZ15+jTMS3DnuvUwITwnbbhdkA60QP8RuES4U/bPoSzjPp9k= +ramoth.oob,ramoth.oob.openstreetmap.org,10.0.49.5 ssh-dss AAAAB3NzaC1kc3MAAACBALRCRi3NY07WEWUGYFUftD/wNB6untreAjuujJY77ZYghV058QnIx8hu/1hcyXKdHTjI5d8qzDDj5ypG+iQ8Td4lHjHKySqUBvWBp6Uy5TC0Pa2R/mBt+S1Vilg3uvubW7uYpq8m3VI43fzbURfGKnV1lXLyjP/hyafgnndlfAZjAAAAFQC9N/IJEeMEEpyw4cL7JbPS2NhrFQAAAIAmYsZHe0TLlNGa9xOhjnEneU1U88ZxwXJQCRP/Vo2CWpEMC7GPNI3TkZjvPyH8S3s7u3pcDXR8Mm7WwbJr7ySFx1PkkXWxnZiSoGwbectXApuQor3+Mpjkdtvl1uxDAt91/mGyK4ytKoz9uIeUijbHRZfemV6rB09tvgUg4BlPtwAAAIBQyeIyMduHKtDbk9FZ5N9F7bVG1NFg9NvWf/06J/8g5l32iFaxDZ43bpymVWSce1Jm3stV/G5wopCETeYFuOnb1TzmQLoqNLixU76QWDehMDAKADurHmzf1JbCuErwTGMeoCbP8o1G9LlKwBXppHrZPBMDj7/+N5v3CGiZ4hsFlw== +grisu.oob,grisu.oob.openstreetmap.org,10.0.33.20 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDTEivJ/aHG2g7TVGEXJUDcOrbQKMOwYEzWiKvMTsftxOKqMW2uKzCZDkW3BNXIBiAXoswaqK0qkh519i56tY9ff7XjH5YoYbPyWwbhMPoBlIc6wBF+uMV3dBRrb7iRe0HFhpl/XsTo5vw8x+5T/ITrlvI8T7ZfE6uTLxKFDxYOiQ== +thorn-03.oob,thorn-03.oob.openstreetmap.org,10.0.49.53 ssh-dss AAAAB3NzaC1kc3MAAACBAKZf6qtRHGHjPfOP3drwO1m28l4fpN5X5c8ArkeKhV3aTzY404uwCsSvfYQUw/s24E+989MWZxLUO0Ib+nV+hWlK0nxI85bQPIvOjaWNtbggOfNdz4VyNcLxxzsiJqNhQpGQ3LW2zQ7fsP9pM5ALAs7MDOaSdNja58aUgEMY1ta5AAAAFQC1r9L5Mkax780fOnwkDB6eIaNjCwAAAH97vSxdyRel4IucL4Ckn7Y/zVwFeLpwHiVP41MN7dO2aApuWvsygLU/FUAouv/3PRug/bAAS56w2/JLKVvyo1aRPNHAvgPFEDodqLc+dnC1bXFu1VR69ntQYTEe6iReLlwzeEPLwTW5ucGHddXVbP2jG3R+JEmGGt87P3JxicCjAAAAgBrDGGrP1jST/axY9UTs1q0ljkET93/vIitbc/C87pe08ccQUL/PUn0GTrVhXps2Q2nfg2IuI32vYYy0lNKXD53NOpu5G0ZxEB6BYxwejwD5YLZhJQD1mtZ5JvyAPeeWfZa15ZRoI0qzg9RxzB5bp4cRKtHxFcGRAj1jjHkN+80x +thorn-02.oob,thorn-02.oob.openstreetmap.org,10.0.49.52 ssh-dss AAAAB3NzaC1kc3MAAACBAKZf6qtRHGHjPfOP3drwO1m28l4fpN5X5c8ArkeKhV3aTzY404uwCsSvfYQUw/s24E+989MWZxLUO0Ib+nV+hWlK0nxI85bQPIvOjaWNtbggOfNdz4VyNcLxxzsiJqNhQpGQ3LW2zQ7fsP9pM5ALAs7MDOaSdNja58aUgEMY1ta5AAAAFQC1r9L5Mkax780fOnwkDB6eIaNjCwAAAH97vSxdyRel4IucL4Ckn7Y/zVwFeLpwHiVP41MN7dO2aApuWvsygLU/FUAouv/3PRug/bAAS56w2/JLKVvyo1aRPNHAvgPFEDodqLc+dnC1bXFu1VR69ntQYTEe6iReLlwzeEPLwTW5ucGHddXVbP2jG3R+JEmGGt87P3JxicCjAAAAgEitEET7IzW9j0lgxcgXT9JgzDR/cbQdlYSwV6rcWvHW9cz1ArWmJ6BY2AJ6CG3wTznVbHPupiFKf0jvkX0omKu8K90f5FJc2/BkUP4aG72YmAoPVe4bflGykvKJE9Rd4BDyPWGqI955Okp3VGCEKXBS/fwnoOZlei+9ex334hK2 +thorn-01.oob,thorn-01.oob.openstreetmap.org,10.0.49.51 ssh-dss AAAAB3NzaC1kc3MAAACBAKZf6qtRHGHjPfOP3drwO1m28l4fpN5X5c8ArkeKhV3aTzY404uwCsSvfYQUw/s24E+989MWZxLUO0Ib+nV+hWlK0nxI85bQPIvOjaWNtbggOfNdz4VyNcLxxzsiJqNhQpGQ3LW2zQ7fsP9pM5ALAs7MDOaSdNja58aUgEMY1ta5AAAAFQC1r9L5Mkax780fOnwkDB6eIaNjCwAAAH97vSxdyRel4IucL4Ckn7Y/zVwFeLpwHiVP41MN7dO2aApuWvsygLU/FUAouv/3PRug/bAAS56w2/JLKVvyo1aRPNHAvgPFEDodqLc+dnC1bXFu1VR69ntQYTEe6iReLlwzeEPLwTW5ucGHddXVbP2jG3R+JEmGGt87P3JxicCjAAAAgQCFBaTPsbNtWlUSsGnRzObp3NVC6MOro10p4qSXB0kwAB+hQx/IrIH8BjduR+b6Uv2cm/UMnGRzS/1lGYe15cSs0V/IOUyXdVeX+jB0TXzS4hTqclGKJ0Ay2WEsgW27IdPxIjQg/W77s9AZ2UlyEtT7gK2oergD60yUvRfLLJioYA== +spike-03.oob,spike-03.oob.openstreetmap.org,10.0.49.8 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCvTY6CDpJgBcU5T0l7Hmn6UkLZw1d0EQEPlcQM1UvLfdSKayVR79Yl31eVWFbA+R+QqQ8LKcmzx6ztWPuemW3Ym/gZ7NNYH10y1Rw9LywWhVnFOjKIBUVJmjdiuxftyCPveHu672k1KJ+bApXlA3/oMBmtCckr2Wod2qJDx7JIeQ== +spike-01.oob,spike-01.oob.openstreetmap.org,10.0.49.6 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDHhi90mKvMe+FL1pdzBPWUfC+a0ckv31Qou7Yby1Kn9xhrR5oHvyoT4bc/xPrYvaxRZUHWn+J66ZdylhyfCZf6/5g8xghJoYVAZJn9yCV0R7xw2fzHCgue3iS/Yrep2V3DRaXt/zy+PCe7wZX7InLLtp1rV/Vx2xG3lV91OGa4Zw== diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb index 089ca1c30..467dd4556 100644 --- a/cookbooks/web/templates/default/apache.backend.erb +++ b/cookbooks/web/templates/default/apache.backend.erb @@ -47,8 +47,8 @@ # Get the real remote IP for requests via a trusted proxy # RemoteIPHeader X-Forwarded-For - RemoteIPTrustedProxy 146.179.159.160/27 RemoteIPTrustedProxy 10.0.32.0/24 + RemoteIPTrustedProxy 10.0.48.0/24 # # Pass authentication related headers to cgimap diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb index eb3c66ab4..6cbf86418 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -220,9 +220,9 @@ # # Define a load balancer for the IC backends # - + ProxySet lbmethod=bybusyness -<% ["rails1.ic", "rails2.ic", "rails3.ic"].each do |backend| -%> +<% ["rails1.ams", "rails2.ams", "rails3.ams"].each do |backend| -%> BalancerMember https://<%= backend %> disablereuse=on <% end -%> diff --git a/roles/backup.rb b/roles/backup.rb index cdc361cc2..b0c519bd8 100644 --- a/roles/backup.rb +++ b/roles/backup.rb @@ -20,9 +20,9 @@ default_attributes( :transfer_logging => false, :hosts_allow => [ "193.60.236.0/24", # ucl external - "146.179.159.160/27", # ic internal - "193.63.75.96/27", # ic external - "2001:630:12:500::/64", # ic external + "10.0.48.0/20", # equinix internal + "130.117.76.0/27", # equinix external + "2001:978:2:2C::172:0/112", # equinix external "10.0.32.0/20", # bytemark internal "89.16.162.16/28", # bytemark external "2001:41c9:2:d6::/64", # bytemark external diff --git a/roles/db-master.rb b/roles/db-master.rb index e29b7131c..3bfdbd7ca 100644 --- a/roles/db-master.rb +++ b/roles/db-master.rb @@ -11,30 +11,13 @@ default_attributes( :archive_command => "/usr/local/bin/openstreetmap-wal-e --terse wal-push %p", :max_wal_senders => "3", :late_authentication_rules => [ - { :database => "replication", :user => "replication", :address => "146.179.159.168/32" }, - { :database => "replication", :user => "replication", :address => "146.179.159.170/32" }, + { :database => "replication", :user => "replication", :address => "10.0.48.50/32" }, + { :database => "replication", :user => "replication", :address => "10.0.48.5/32" }, { :database => "replication", :user => "replication", :address => "10.0.0.10/32" }, { :database => "replication", :user => "replication", :address => "10.0.32.40/32" } ] } } - }, - :rsyncd => { - :modules => { - :archive => { - :comment => "WAL Archive", - :path => "/store/arrays/nvme/postgresql-archive", - :read_only => true, - :write_only => false, - :list => false, - :uid => "postgres", - :gid => "postgres", - :transfer_logging => false, - :hosts_allow => [ - "146.179.159.168", "146.179.159.170, 10.0.0.10, 10.0.32.40" - ] - } - } } ) diff --git a/roles/db.rb b/roles/db.rb index d81ad24d9..bb13e00c5 100644 --- a/roles/db.rb +++ b/roles/db.rb @@ -51,9 +51,9 @@ default_attributes( :cpu_tuple_cost => "0.1", :log_min_duration_statement => "1000", :late_authentication_rules => [ - { :address => "146.179.159.160/27" }, { :address => "10.0.16.0/20" }, - { :address => "10.0.32.0/20" } + { :address => "10.0.32.0/20" }, + { :address => "10.0.48.0/20" } ] } } diff --git a/roles/ic.rb b/roles/equinix.rb similarity index 58% rename from roles/ic.rb rename to roles/equinix.rb index ae991575a..eaa81c314 100644 --- a/roles/ic.rb +++ b/roles/equinix.rb @@ -1,14 +1,9 @@ -name "ic" -description "Role applied to all servers at Imperial College" +name "equnix" +description "Role applied to all servers at Equinix" default_attributes( - :accounts => { - :users => { - :icladmin => { :status => :user } - } - }, :networking => { - :nameservers => ["8.8.8.8", "146.179.159.177"], + :nameservers => ["66.28.0.45", "66.28.0.61", "2001:978:1:1::d", "2001:978:1:2::d"], :roles => { :internal => { :inet => { @@ -17,7 +12,7 @@ default_attributes( } }, :external => { - :zone => "ic", + :zone => "ams", :inet => { :prefix => "27", :gateway => "130.117.76.30" @@ -32,19 +27,19 @@ default_attributes( :web => { :backends => %w[rails1 rails2 rails3], :fileserver => "ironbelly", - :readonly_database_host => "karm.ic.openstreetmap.org" + :readonly_database_host => "karm.ams.openstreetmap.org" } ) override_attributes( :networking => { - :search => ["ic.openstreetmap.org", "openstreetmap.org"] + :search => ["ams.openstreetmap.org", "openstreetmap.org"] }, :ntp => { - :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"] + :servers => ["0.nl.pool.ntp.org", "1.nl.pool.ntp.org", "europe.pool.ntp.org"] } ) run_list( - "role[gb]" + "role[nl]" ) diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index d25754003..988d636eb 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -104,15 +104,15 @@ default_attributes( :gid => "www-data", :transfer_logging => false, :hosts_allow => [ - "193.60.236.0/24", # ucl external - "146.179.159.160/27", # ic internal - "193.63.75.96/27", # ic external - "2001:630:12:500::/64", # ic external - "10.0.32.0/20", # bytemark internal - "89.16.162.16/28", # bytemark external - "2001:41c9:2:d6::/64", # bytemark external - "127.0.0.0/8", # localhost - "::1" # localhost + "193.60.236.0/24", # ucl external + "10.0.48.0/20", # equinix internal + "130.117.76.0/27", # equinix external + "2001:978:2:2C::172:0/112", # equinix external + "10.0.32.0/20", # bytemark internal + "89.16.162.16/28", # bytemark external + "2001:41c9:2:d6::/64", # bytemark external + "127.0.0.0/8", # localhost + "::1" # localhost ], :nodes_allow => "roles:tilecache" }