X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1c01b94c6cf983f79e0919ea4fc7a7f103d03864..cd8e73ddfbf994bcb238898e5cddaced6681d015:/roles/shenron.rb diff --git a/roles/shenron.rb b/roles/shenron.rb index ce00c01c4..b5cb9d559 100644 --- a/roles/shenron.rb +++ b/roles/shenron.rb @@ -9,9 +9,6 @@ default_attributes( :max_spare_threads => 150 } }, - :apt => { - :sources => ["brightbox-ruby-ng"] - }, :hardware => { :mcelog => { :enabled => false @@ -19,18 +16,6 @@ default_attributes( :modules => [ "it87" ] - }, - :openvpn => { - :address => "10.0.16.3", - :tunnels => { - :shenron2ucl => { - :port => "1194", - :mode => "server", - :peer => { - :host => "ridley.openstreetmap.org" - } - } - } } ) @@ -53,7 +38,9 @@ override_attributes( :prefix => "64", :gateway => "fe80::1" } - } + }, + :nameservers => ["1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001"], + :private_address => "10.0.16.100" } ) @@ -65,6 +52,5 @@ run_list( "role[trac]", "role[osqa]", "role[irc]", - "recipe[blogs]", - "recipe[openvpn]" + "recipe[blogs]" )