X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5930e1f5d32dd470fa9b60a231bae35a5a23e4eb..44d4723f2ea99dd26f59ae0798667ab07fe6278a:/roles/ironbelly.rb diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 7c90c9c87..fb86c78f0 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -3,7 +3,7 @@ description "Master role applied to ironbelly" default_attributes( :apt => { - :sources => [ "ubuntugis-unstable" ] + :sources => ["ubuntugis-unstable"] }, :git => { :allowed_nodes => "*:*", @@ -56,9 +56,9 @@ default_attributes( :uid => "tomh", :gid => "tomh", :transfer_logging => false, - :hosts_allow => [ - "89.16.179.150", # shenron - "2001:41c8:10:996:21d:7dff:fec3:df70", # shenron + :hosts_allow => [ + "212.110.172.32", # shenron + "2001:41c9:1:400::32", # shenron "212.159.112.221" # grant ] }, @@ -72,7 +72,8 @@ default_attributes( :gid => "www-data", :transfer_logging => false, :hosts_allow => [ - "128.40.168.0/24", # ucl external + "128.40.168.0/24", # ucl external (wates) + "128.40.45.192/27", # ucl external (wolfson) "146.179.159.160/27", # ic internal "193.63.75.96/27", # ic external "2001:630:12:500::/64", # ic external @@ -83,7 +84,7 @@ default_attributes( } } } -); +) run_list( "role[ic]", @@ -95,7 +96,10 @@ run_list( "role[backup]", "role[stats]", "role[planet]", + "role[planetdump]", + "role[logstash]", "recipe[rsyncd]", "recipe[openvpn]", - "recipe[git::server]" + "recipe[git::server]", + "recipe[tilelog]" )