X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9b6fa6d1c1d425a8e1368ae1ec23bfdee308b169..dd7f629ab3f1404a2a3ea5a9c4e28c416ecb6e3b:/cookbooks/networking/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index 4c0e04746..c24686d0b 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -23,6 +23,8 @@ require "ipaddr" require "yaml" +keys = data_bag_item("networking", "keys") + package "netplan.io" netplan = { @@ -39,20 +41,20 @@ node[:networking][:interfaces].each do |name, interface| if interface[:interface] if interface[:role] && (role = node[:networking][:roles][interface[:role]]) 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] + node.default[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix] + node.default[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway] + node.default[:networking][:interfaces][name][:routes] = role[interface[:family]][:routes] end - node.normal[:networking][:interfaces][name][:metric] = role[:metric] - node.normal[:networking][:interfaces][name][:zone] = role[:zone] + node.default[:networking][:interfaces][name][:metric] = role[:metric] + node.default[:networking][:interfaces][name][:zone] = role[:zone] end if interface[:address] prefix = node[:networking][:interfaces][name][:prefix] - node.normal[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix) - node.normal[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix) + node.default[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix) + node.default[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix) end interface = node[:networking][:interfaces][name] @@ -134,6 +136,8 @@ node[:networking][:interfaces].each do |name, interface| if interface[:routes] interface[:routes].each do |to, parameters| + next if parameters[:via] == interface[:address] + route = { "to" => to } @@ -181,6 +185,126 @@ package "cloud-init" do action :purge end +if node[:networking][:wireguard][:enabled] + wireguard_id = persistent_token("networking", "wireguard") + + node.default[:networking][:wireguard][:address] = "fd43:e709:ea6d:1:#{wireguard_id[0, 4]}:#{wireguard_id[4, 4]}:#{wireguard_id[8, 4]}:#{wireguard_id[12, 4]}" + + package "wireguard-tools" do + compile_time true + end + + directory "/var/lib/systemd/wireguard" do + owner "root" + group "systemd-network" + mode "750" + compile_time true + end + + file "/var/lib/systemd/wireguard/private.key" do + action :create_if_missing + owner "root" + group "systemd-network" + mode "640" + content %x(wg genkey) + compile_time true + end + + node.default[:networking][:wireguard][:public_key] = %x(wg pubkey < /var/lib/systemd/wireguard/private.key).chomp + + file "/var/lib/systemd/wireguard/preshared.key" do + action :create_if_missing + owner "root" + group "systemd-network" + mode "640" + content keys["wireguard"] + end + + if node[:roles].include?("gateway") + search(:node, "roles:gateway") do |gateway| + next if gateway.name == node.name + next unless gateway[:networking][:wireguard] && gateway[:networking][:wireguard][:enabled] + + allowed_ips = gateway.interfaces(:role => :internal).map do |interface| + "#{interface[:network]}/#{interface[:prefix]}" + end + + node.default[:networking][:wireguard][:peers] << { + :public_key => gateway[:networking][:wireguard][:public_key], + :allowed_ips => allowed_ips, + :endpoint => "#{gateway.name}:51820" + } + end + + search(:node, "roles:mail OR roles:prometheus") do |server| + allowed_ips = server.interfaces(:role => :internal).map do |interface| + "#{interface[:network]}/#{interface[:prefix]}" + end + + if server[:networking][:private_address] + allowed_ips << "#{server[:networking][:private_address]}/32" + end + + node.default[:networking][:wireguard][:peers] << { + :public_key => server[:networking][:wireguard][:public_key], + :allowed_ips => allowed_ips, + :endpoint => "#{server.name}:51820" + } + end + + node.default[:networking][:wireguard][:peers] << { + :public_key => "7Oj9ufNlgidyH/xDc+aHQKMjJPqTmD/ab13agMh6AxA=", + :allowed_ips => "10.0.16.1/32", + :endpoint => "gate.compton.nu:51820" + } + end + + template "/etc/systemd/network/wireguard.netdev" do + source "wireguard.netdev.erb" + owner "root" + group "systemd-network" + mode "640" + end + + template "/etc/systemd/network/wireguard.network" do + source "wireguard.network.erb" + owner "root" + group "root" + mode "644" + end + + if node[:lsb][:release].to_f < 20.04 + execute "ip-link-delete-wg0" do + action :nothing + command "ip link delete wg0" + subscribes :run, "template[/etc/systemd/network/wireguard.netdev]" + only_if { ::File.exist?("/sys/class/net/wg0") } + end + + service "systemd-networkd" do + action :nothing + subscribes :restart, "template[/etc/systemd/network/wireguard.netdev]" + subscribes :restart, "template[/etc/systemd/network/wireguard.network]" + not_if { ENV.key?("TEST_KITCHEN") } + end + else + execute "networkctl-delete-wg0" do + action :nothing + command "networkctl delete wg0" + subscribes :run, "template[/etc/systemd/network/wireguard.netdev]" + only_if { ::File.exist?("/sys/class/net/wg0") } + end + + execute "networkctl-reload" do + action :nothing + command "networkctl reload" + subscribes :run, "template[/etc/systemd/network/wireguard.netdev]" + subscribes :run, "template[/etc/systemd/network/wireguard.network]" + not_if { ENV.key?("TEST_KITCHEN") } + end + end +end + ohai "reload-hostname" do action :nothing plugin "hostname" @@ -219,9 +343,8 @@ template "/etc/systemd/resolved.conf.d/99-chef.conf" do end if node[:filesystem][:by_mountpoint][:"/etc/resolv.conf"] - mount "/etc/resolv.conf" do - action :umount - device node[:filesystem][:by_mountpoint][:"/etc/resolv.conf"][:devices].first + execute "umount-resolve-conf" do + command "umount -c /etc/resolv.conf" end end @@ -229,34 +352,6 @@ link "/etc/resolv.conf" do to "../run/systemd/resolve/stub-resolv.conf" end -node.interfaces(:role => :internal) do |interface| - if interface[:gateway] && interface[:gateway] != interface[:address] - search(:node, "networking_interfaces*address:#{interface[:gateway]}") do |gateway| - next unless gateway[:openvpn] - - gateway[:openvpn][:tunnels].each_value do |tunnel| - if tunnel[:peer][:address] - route tunnel[:peer][:address] do - netmask "255.255.255.255" - gateway interface[:gateway] - device interface[:interface] - end - end - - next unless tunnel[:peer][:networks] - - tunnel[:peer][:networks].each do |network| - route network[:address] do - netmask network[:netmask] - gateway interface[:gateway] - device interface[:interface] - end - end - end - end - end -end - zones = {} search(:node, "networking:interfaces").collect do |n| @@ -341,10 +436,20 @@ template "/etc/shorewall/rules" do notifies :restart, "service[shorewall]" end -service "shorewall" do - action [:enable, :start] - supports :restart => true - status_command "shorewall status" +if node[:networking][:firewall][:enabled] + service "shorewall" do + action [:enable, :start] + supports :restart => true + status_command "shorewall status" + ignore_failure true + end +else + service "shorewall" do + action [:disable, :stop] + supports :restart => true + status_command "shorewall status" + ignore_failure true + end end template "/etc/logrotate.d/shorewall" do @@ -365,14 +470,20 @@ firewall_rule "limit-icmp-echo" do rate_limit "s:1/sec:5" end -%w[ucl ams bm].each do |zone| - firewall_rule "accept-openvpn-#{zone}" do +if node[:networking][:wireguard][:enabled] + wireguard_source = if node[:roles].include?("gateway") + "net" + else + "osm" + end + + firewall_rule "accept-wireguard" do action :accept - source zone + source wireguard_source dest "fw" proto "udp" - dest_ports "1194:1197" - source_ports "1194:1197" + dest_ports "51820" + source_ports "51820" end end @@ -462,10 +573,20 @@ unless node.interfaces(:family => :inet6).empty? notifies :restart, "service[shorewall6]" end - service "shorewall6" do - action [:enable, :start] - supports :restart => true - status_command "shorewall6 status" + if node[:networking][:firewall][:enabled] + service "shorewall6" do + action [:enable, :start] + supports :restart => true + status_command "shorewall6 status" + ignore_failure true + end + else + service "shorewall6" do + action [:disable, :stop] + supports :restart => true + status_command "shorewall6 status" + ignore_failure true + end end template "/etc/logrotate.d/shorewall6" do