X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a7d96c8358a00088b485fadb5966eb4b231d2ff1..327595ecd12ad781b680d8ca5d388519a0b54588:/roles/horntail.rb?ds=inline diff --git a/roles/horntail.rb b/roles/horntail.rb index 6f88fdf24..2d4e9057a 100644 --- a/roles/horntail.rb +++ b/roles/horntail.rb @@ -65,18 +65,6 @@ default_attributes( } } }, - :openvpn => { - :address => "10.0.16.2", - :tunnels => { - :ic2ucl => { - :port => "1194", - :mode => "server", - :peer => { - :host => "ridley.openstreetmap.org" - } - } - } - }, :rsyncd => { :modules => { :hosts => { @@ -111,36 +99,11 @@ default_attributes( "127.0.0.0/8", # localhost "::1" # localhost ] - }, - :backup => { - :comment => "Backups", - :path => "/store/backup", - :read_only => false, - :write_only => true, - :list => false, - :uid => "osmbackup", - :gid => "osmbackup", - :transfer_logging => false, - :hosts_allow => [ - "128.40.168.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.0.0.0/8", # localhost - "::1" # localhost - ] } } } ); run_list( - "role[ic]", - "role[gateway]", - "role[chef-server]", - "role[chef-repository]", - "role[planet]", - "role[web-storage]", - "recipe[rsyncd]", - "recipe[openvpn]" + "role[ic]" )