X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/066b1f8688516068b04bb0a555f269be0510f322..d08ce246307a810b931513fe0feaa15b93455f99:/roles/ironbelly.rb diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 4eb5fbc45..8b90bbb44 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" @@ -107,8 +107,7 @@ 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 @@ -127,8 +126,6 @@ default_attributes( run_list( "role[ic]", "role[gateway]", - "role[chef-server]", - "role[chef-repository]", "role[web-storage]", "role[supybot]", "role[backup]", @@ -136,9 +133,8 @@ run_list( "role[planet]", "role[planetdump]", "role[logstash]", + "role[letsencrypt]", "recipe[rsyncd]", "recipe[openvpn]", - "recipe[git::server]", - "recipe[tilelog]", - "recipe[serverinfo]" + "recipe[tilelog]" )