if role[interface[:family]]
node.normal[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
node.normal[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
+ node.normal[:networking][:interfaces][name][:routes] = role[interface[:family]][:routes]
end
node.normal[:networking][:interfaces][name][:metric] = role[:metric]
)
end
end
+
+ if interface[:routes]
+ interface[:routes].each do |to, parameters|
+ route = {
+ "to" => to
+ }
+
+ route["type"] = parameters[:type] if parameters[:type]
+ route["via"] = parameters[:via] if parameters[:via]
+ route["metric"] = parameters[:metric] if parameters[:metric]
+
+ deviceplan["routes"].push(route)
+ end
+ end
else
node.rm(:networking, :interfaces, name)
end
}
},
:postgresql => {
- :versions => ["10"],
+ :versions => ["12"],
:settings => {
:defaults => {
:work_mem => "300MB",
:random_page_cost => "1.5",
:effective_cache_size => "60GB",
:fsync => "on",
- :effective_io_concurrency => "3"
+ :effective_io_concurrency => "500"
}
}
},
:enable_backup => false,
:enable_git_updates => true,
:dbadmins => %w[lonvia tomh],
- :dbcluster => "10/main",
- :postgis => "2.4",
+ :dbcluster => "12/main",
+ :postgis => "2.5",
:flatnode_file => "/ssd/nominatim/nodes.store",
:logdir => "/ssd/nominatim/log",
:tablespaces => {
default_attributes(
:networking => {
- :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"],
- :dnssec => "no",
+ :nameservers => ["66.28.0.45", "66.28.0.61"],
:roles => {
:internal => {
:inet => {
},
:inet6 => {
:prefix => "64",
- :gateway => "2001:978:2:2C::172:1"
+ :gateway => "2001:978:2:2C::172:1",
+ :routes => {
+ "2001:978:2:2c::/64" => { :type => "unreachable" },
+ "2001:4860::/32" => { :type => "unreachable" },
+ "2a00:1450:4000::/37" => { :type => "unreachable" }
+ }
}
}
}
"support" => "support@otrs.openstreetmap.org",
"memorial" => "communication@osmfoundation.org",
"legal" => "legal@osmfoundation.org",
- "dmca" => "dmca@osmfoundation.org"
+ "dmca" => "dmca@osmfoundation.org",
+ "program-sotm" => "sotm-program@otrs.openstreetmap.org"
},
:private_aliases => "mail"
},
:group => "www-data",
:home_directory => "/opt/otrs"
},
+ :otrs_sotm_program => {
+ :comment => "sotm-program@otrs.openstreetmap.org",
+ :domains => ["otrs.openstreetmap.org"],
+ :local_parts => ["sotm-program"],
+ :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'State of the Map:Program'",
+ :user => "otrs",
+ :group => "www-data",
+ :home_directory => "/opt/otrs"
+ },
:otrs_support => {
:comment => "support@otrs.openstreetmap.org",
:domains => ["otrs.openstreetmap.org"],
:random_page_cost => "1.5",
:effective_cache_size => "60GB",
:effective_io_concurrency => "256",
- :fsync => "off"
+ :fsync => "on"
}
}
},
:nominatim => {
- :state => "off",
+ :state => "standalone",
:dbadmins => %w[lonvia tomh],
:dbcluster => "12/main",
:postgis => "2.5",