X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8a91485750044e1a2371ac2623247354893a84f4..2ff1b4aae084799433890a276dd09d0b6a77ce54:/roles/ironbelly.rb diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 0cdc647e1..ab306c6a2 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -23,7 +23,7 @@ default_attributes( } }, :git => { - :allowed_nodes => "*:*", + :allowed_nodes => "fqdn:*", :user => "chefrepo", :group => "chefrepo", :backup => "chef-git" @@ -77,6 +77,9 @@ default_attributes( } } }, + :planet => { + :replication => "enabled" + }, :rsyncd => { :modules => { :hosts => { @@ -104,11 +107,13 @@ default_attributes( :gid => "www-data", :transfer_logging => false, :hosts_allow => [ - "128.40.168.0/24", # ucl external (wates) - "128.40.45.192/27", # ucl external (wolfson) + "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 ], @@ -130,6 +135,7 @@ run_list( "role[planet]", "role[planetdump]", "role[logstash]", + "role[letsencrypt]", "recipe[rsyncd]", "recipe[openvpn]", "recipe[git::server]",