From: Tom Hughes Date: Sun, 24 Jun 2018 11:24:33 +0000 (+0100) Subject: Remove traces of APC power strips X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/91fa3e5daf59219de813f42d623cc79c8e365088?ds=sidebyside Remove traces of APC power strips --- diff --git a/cookbooks/bind/templates/default/db.10.erb b/cookbooks/bind/templates/default/db.10.erb index 98eef8af5..2bd2b2239 100644 --- a/cookbooks/bind/templates/default/db.10.erb +++ b/cookbooks/bind/templates/default/db.10.erb @@ -21,10 +21,6 @@ $TTL 604800 14.0.0 IN PTR errol.ucl.openstreetmap.org. 15.0.0 IN PTR yevaud.ucl.openstreetmap.org. -49.0.0 IN PTR apc1.ucl.openstreetmap.org. -50.0.0 IN PTR apc2.ucl.openstreetmap.org. -51.0.0 IN PTR apc3.ucl.openstreetmap.org. - 5.1.0 IN PTR norbert.oob.openstreetmap.org. 6.1.0 IN PTR urmel.oob.openstreetmap.org. 7.1.0 IN PTR faffy.oob.openstreetmap.org. diff --git a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb index d57fd109d..53b568672 100644 --- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb +++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb @@ -14,24 +14,6 @@ subnet <%= interface[:network] %> netmask <%= interface[:netmask] %> { } <% end -%> -host apc1.<%= @domain %> { - hardware ethernet 00:c0:b7:77:f3:d8; - server-name "apc1.<%= @domain %>"; - fixed-address apc1.<%= @domain %>; -} - -host apc2.<%= @domain %> { - hardware ethernet 00:c0:b7:52:b7:d2; - server-name "apc2.<%= @domain %>"; - fixed-address apc2.<%= @domain %>; -} - -host apc3.<%= @domain %> { - hardware ethernet 00:c0:b7:52:b9:1e; - server-name "apc3.<%= @domain %>"; - fixed-address apc3.<%= @domain %>; -} - host ascalon.oob.openstreetmap.org { hardware ethernet 00:19:bb:39:3c:64; server-name "ascalon.oob.openstreetmap.org"; diff --git a/cookbooks/openssh/templates/default/ssh_known_hosts.erb b/cookbooks/openssh/templates/default/ssh_known_hosts.erb index 0fd5e8f18..3e0d9f59f 100644 --- a/cookbooks/openssh/templates/default/ssh_known_hosts.erb +++ b/cookbooks/openssh/templates/default/ssh_known_hosts.erb @@ -5,9 +5,6 @@ <%= host[:names].join(",") -%>,<%= host[:addresses].join(",") -%> <%= type %> <%= host[:keys][type] %> <% end -%> <% end -%> -apc1,apc1.ucl.openstreetmap.org,10.0.0.49 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAYQDYDLYD52vwCagyebWxujdLw5/jnJ4Nln8g+pXFylT6OJU2R6t+U7mndZUKj1ClCt4AkS77/lEncs8Ie9YM3zzZlN0zsMEmhXzT62wO+0WJkr+hGSlTkMp1iL+dqC9Bk+U= -apc2,apc2.ucl.openstreetmap.org,10.0.0.50 ssh-rsa AAAAB3NzaC1yc2EAAAACAQEAAAEBANYmUWIbP1bVQEcyeIoKZOvW/cyzmWytUA0u/057WGCMB70UKJrgmhRoArtxm3O4sFYS5b5xzhpcJ6YyYPjs3GMa67lkUBv/mOZEOIM20VeP7biRQf5DLrrSF5cS4A3p+ft7TyFPAuIgywxHQwpnRi7ZtBIPNj6MbRukUYivWrBVQML23O2hfWbwyLWQCTpedycgb1OFYbKC86r73PwW6ZP3Kzv0CDinDL2heEBT/hdeUkeXJCbop6tU3A4bA/obMTmKxsVoT2vEhto3v/bXFAFDQyYidBrOo+CBa3Nbbl+0wAZLBbrjkbQC7gz6TtU70ceLHo/cl8zmIQlHKa8c/Ec= -apc3,apc3.ucl.openstreetmap.org,10.0.0.51 ssh-rsa AAAAB3NzaC1yc2EAAAACAQEAAAEBAM7kqwZuiMNnTQgI2/CpBwNna2vHC2W5kT0AVRFdd41f+Bet+NbXaHpa+/l1eGaMThtuEpXI8TuyyMP/Wna6xhaSBqcTyinbmc+1rqsSxqXTdNKFX+GSKJay/7jQpe/ZA94MAX/l+jHo50g9bjw5GhSv2sG5VeeabYM+eiTDwjSEwoqpsHYtRSbCCwNgM5hK0lTunPZ+wq31vY8tPbnYTZdi8ENxccXI1+wLPEIGg74FoWxy98lKTc8FIa/JaT37hDOwOC0uzDi1koXp5sCzCVAhRDNzHSSKkiIXx8rXp7/2ZPrKo2j++W/rl0b0xe1UO+/KWxhCC2YsCaDIgBXsG7E= #albi.oob,albi.oob.openstreetmap.org,10.0.1.2 ssh-rsa #albi.oob,albi.oob.openstreetmap.org,10.0.1.2 ssh-dss ridley.oob,ridley.oob.openstreetmap.org,10.0.1.3 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC6FtSZo3FZfOyWVdiUX1CSlWLIiB2iCWmtsfiqQ32i+AbNxiOfqBckp9CQazdaAmMp638TnLpCwSfJk9oJNui/J6yY5jq1RKb5U9YVGkhXvFmHH2dG/QpD9z786jWZ8RFdTwtdpHVfJzfm3vFDOORJcJwnvGr+Fe+fnY43aPzTZQ==