Revert "wiki: use tmp fork of OsmWikibase"

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 0f7b2e49ab804f2258c7c6174ab2fcfc68b70bb0..8ec499d13b33d8e65c16efd73d4164bfbc537778 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -94,17 +94,17 @@ node[:networking][:interfaces].each do |name, interface|
 
       deviceplan["parameters"] = {
         "mode" => interface[:bond][:mode] || "active-backup",
 
       deviceplan["parameters"] = {
         "mode" => interface[:bond][:mode] || "active-backup",

-        "primary" => interface[:bond][:slaves].first,

         "mii-monitor-interval" => interface[:bond][:miimon] || 100,
         "down-delay" => interface[:bond][:downdelay] || 200,
         "up-delay" => interface[:bond][:updelay] || 200
       }
 
         "mii-monitor-interval" => interface[:bond][:miimon] || 100,
         "down-delay" => interface[:bond][:downdelay] || 200,
         "up-delay" => interface[:bond][:updelay] || 200
       }
 

+      deviceplan["parameters"]["primary"] = interface[:bond][:slaves].first if deviceplan["parameters"]["mode"] == "active-backup"

       deviceplan["parameters"]["transmit-hash-policy"] = interface[:bond][:xmithashpolicy] if interface[:bond][:xmithashpolicy]
       deviceplan["parameters"]["lacp-rate"] = interface[:bond][:lacprate] if interface[:bond][:lacprate]
     end
 
       deviceplan["parameters"]["transmit-hash-policy"] = interface[:bond][:xmithashpolicy] if interface[:bond][:xmithashpolicy]
       deviceplan["parameters"]["lacp-rate"] = interface[:bond][:lacprate] if interface[:bond][:lacprate]
     end
 

-    if interface[:gateway]
+    if interface[:gateway] && interface[:gateway] != interface[:address]

       if interface[:family] == "inet"
         default_route = "0.0.0.0/0"
       elsif interface[:family] == "inet6"
       if interface[:family] == "inet"
         default_route = "0.0.0.0/0"
       elsif interface[:family] == "inet6"


@@ -156,7 +156,7 @@ end
 
 netplan["network"]["bonds"].each_value do |bond|
   bond["interfaces"].each do |interface|
 
 netplan["network"]["bonds"].each_value do |bond|
   bond["interfaces"].each do |interface|

-    netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false }
+    netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false, "optional" => true }

   end
 end
 
   end
 end
 


@@ -166,6 +166,10 @@ netplan["network"]["vlans"].each_value do |vlan|
   end
 end
 
   end
 end
 

+file "/etc/netplan/00-installer-config.yaml" do
+  action :delete
+end
+

 file "/etc/netplan/01-netcfg.yaml" do
   action :delete
 end
 file "/etc/netplan/01-netcfg.yaml" do
   action :delete
 end


@@ -192,6 +196,7 @@ if node[:networking][:wireguard][:enabled]
 
   package "wireguard-tools" do
     compile_time true
 
   package "wireguard-tools" do
     compile_time true

+    options "--no-install-recommends"

   end
 
   directory "/var/lib/systemd/wireguard" do
   end
 
   directory "/var/lib/systemd/wireguard" do


@@ -235,13 +240,61 @@ if node[:networking][:wireguard][:enabled]
         :endpoint => "#{gateway.name}:51820"
       }
     end
         :endpoint => "#{gateway.name}:51820"
       }
     end

+
+    search(:node, "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"
+    }
+
+    # Grant home
+    node.default[:networking][:wireguard][:peers] << {
+      :public_key => "RofATnvlWxP3mt87+QKRXFE5MVxtoCcTsJ+yftZYEE4=",
+      :allowed_ips => "10.89.122.1/32",
+      :endpoint => "gate.firefishy.com:51820"
+    }
+
+    # Grant roaming
+    node.default[:networking][:wireguard][:peers] << {
+      :public_key => "YbUkREE9TAmomqgL/4Fh2e5u2Hh7drN/2o5qg3ndRxg=",
+      :allowed_ips => "10.89.123.1/32",
+      :endpoint => "roaming.firefishy.com:51820"
+    }
+  elsif node[:roles].include?("shenron")
+    search(:node, "roles:gateway") do |gateway|
+      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

   end
 
   template "/etc/systemd/network/wireguard.netdev" do
     source "wireguard.netdev.erb"
     owner "root"
   end
 
   template "/etc/systemd/network/wireguard.netdev" do
     source "wireguard.netdev.erb"
     owner "root"

-    group "root"
-    mode "644"
+    group "systemd-network"
+    mode "640"

   end
 
   template "/etc/systemd/network/wireguard.network" do
   end
 
   template "/etc/systemd/network/wireguard.network" do


@@ -263,7 +316,7 @@ if node[:networking][:wireguard][:enabled]
       action :nothing
       subscribes :restart, "template[/etc/systemd/network/wireguard.netdev]"
       subscribes :restart, "template[/etc/systemd/network/wireguard.network]"
       action :nothing
       subscribes :restart, "template[/etc/systemd/network/wireguard.netdev]"
       subscribes :restart, "template[/etc/systemd/network/wireguard.network]"

-      not_if { ENV.key?("TEST_KITCHEN") }
+      not_if { kitchen? }

     end
   else
     execute "networkctl-delete-wg0" do
     end
   else
     execute "networkctl-delete-wg0" do


@@ -278,7 +331,7 @@ if node[:networking][:wireguard][:enabled]
       command "networkctl reload"
       subscribes :run, "template[/etc/systemd/network/wireguard.netdev]"
       subscribes :run, "template[/etc/systemd/network/wireguard.network]"
       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") }
+      not_if { kitchen? }

     end
   end
 end
     end
   end
 end


@@ -291,7 +344,7 @@ end
 execute "hostnamectl-set-hostname" do
   command "hostnamectl set-hostname #{node[:networking][:hostname]}"
   notifies :reload, "ohai[reload-hostname]"
 execute "hostnamectl-set-hostname" do
   command "hostnamectl set-hostname #{node[:networking][:hostname]}"
   notifies :reload, "ohai[reload-hostname]"

-  not_if { ENV.key?("TEST_KITCHEN") || node[:hostnamectl][:static_hostname] == node[:networking][:hostname] }
+  not_if { kitchen? || node[:hostnamectl][:static_hostname] == node[:networking][:hostname] }

 end
 
 template "/etc/hosts" do
 end
 
 template "/etc/hosts" do


@@ -299,7 +352,7 @@ template "/etc/hosts" do
   owner "root"
   group "root"
   mode "644"
   owner "root"
   group "root"
   mode "644"

-  not_if { ENV["TEST_KITCHEN"] }
+  not_if { kitchen? }

 end
 
 service "systemd-resolved" do
 end
 
 service "systemd-resolved" do


@@ -321,9 +374,8 @@ template "/etc/systemd/resolved.conf.d/99-chef.conf" do
 end
 
 if node[:filesystem][:by_mountpoint][:"/etc/resolv.conf"]
 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
 
   end
 end
 


@@ -347,6 +399,13 @@ end
 
 package "shorewall"
 
 
 package "shorewall"
 

+systemd_service "shorewall-docker" do
+  service "shorewall"
+  dropin "docker"
+  exec_stop "/sbin/shorewall $OPTIONS stop"
+  notifies :restart, "service[shorewall]"
+end
+

 template "/etc/default/shorewall" do
   source "shorewall-default.erb"
   owner "root"
 template "/etc/default/shorewall" do
   source "shorewall-default.erb"
   owner "root"


@@ -407,7 +466,6 @@ template "/etc/shorewall/policy" do
 end
 
 template "/etc/shorewall/rules" do
 end
 
 template "/etc/shorewall/rules" do

-  action :nothing

   source "shorewall-rules.erb"
   owner "root"
   group "root"
   source "shorewall-rules.erb"
   owner "root"
   group "root"


@@ -416,9 +474,12 @@ template "/etc/shorewall/rules" do
   notifies :restart, "service[shorewall]"
 end
 
   notifies :restart, "service[shorewall]"
 end
 

-notify_group "shorewall-rules" do
-  action :run
-  notifies :create, "template[/etc/shorewall/rules]"
+template "/etc/shorewall/stoppedrules" do
+  source "shorewall-stoppedrules.erb"
+  owner "root"
+  group "root"
+  mode "644"
+  notifies :restart, "service[shorewall]"

 end
 
 if node[:networking][:firewall][:enabled]
 end
 
 if node[:networking][:firewall][:enabled]


@@ -426,12 +487,14 @@ if node[:networking][:firewall][:enabled]
     action [:enable, :start]
     supports :restart => true
     status_command "shorewall status"
     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"
   end
 else
   service "shorewall" do
     action [:disable, :stop]
     supports :restart => true
     status_command "shorewall status"

+    ignore_failure true

   end
 end
 
   end
 end
 


@@ -454,9 +517,15 @@ firewall_rule "limit-icmp-echo" do
 end
 
 if node[:networking][:wireguard][:enabled]
 end
 
 if node[:networking][:wireguard][:enabled]

+  wireguard_source = if node[:roles].include?("gateway")
+                       "net"
+                     else
+                       "osm"
+                     end
+

   firewall_rule "accept-wireguard" do
     action :accept
   firewall_rule "accept-wireguard" do
     action :accept

-    source "osm"
+    source wireguard_source

     dest "fw"
     proto "udp"
     dest_ports "51820"
     dest "fw"
     proto "udp"
     dest_ports "51820"


@@ -464,16 +533,24 @@ if node[:networking][:wireguard][:enabled]
   end
 end
 
   end
 end
 

+file "/etc/shorewall/masq" do
+  action :delete
+end
+
+file "/etc/shorewall/masq.bak" do
+  action :delete
+end
+

 if node[:roles].include?("gateway")
 if node[:roles].include?("gateway")

-  template "/etc/shorewall/masq" do
-    source "shorewall-masq.erb"
+  template "/etc/shorewall/snat" do
+    source "shorewall-snat.erb"

     owner "root"
     group "root"
     mode "644"
     notifies :restart, "service[shorewall]"
   end
 else
     owner "root"
     group "root"
     mode "644"
     notifies :restart, "service[shorewall]"
   end
 else

-  file "/etc/shorewall/masq" do
+  file "/etc/shorewall/snat" do

     action :delete
     notifies :restart, "service[shorewall]"
   end
     action :delete
     notifies :restart, "service[shorewall]"
   end


@@ -542,7 +619,6 @@ unless node.interfaces(:family => :inet6).empty?
   end
 
   template "/etc/shorewall6/rules" do
   end
 
   template "/etc/shorewall6/rules" do

-    action :nothing

     source "shorewall-rules.erb"
     owner "root"
     group "root"
     source "shorewall-rules.erb"
     owner "root"
     group "root"


@@ -551,22 +627,19 @@ unless node.interfaces(:family => :inet6).empty?
     notifies :restart, "service[shorewall6]"
   end
 
     notifies :restart, "service[shorewall6]"
   end
 

-  notify_group "shorewall6-rules" do
-    action :run
-    notifies :create, "template[/etc/shorewall6/rules]"
-  end
-

   if node[:networking][:firewall][:enabled]
     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"
     end
   else
     service "shorewall6" do
       action [:disable, :stop]
       supports :restart => true
       status_command "shorewall6 status"

+      ignore_failure true

     end
   end
 
     end
   end