]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/networking/recipes/default.rb
Override systemd shorewall to not use clear
[chef.git] / cookbooks / networking / recipes / default.rb
index 8eed59556e415b854d03e7dcc8d3d77079e1d6cb..41daefe7eacc378af9bf812c82063a7221b0796e 100644 (file)
@@ -236,7 +236,7 @@ if node[:networking][:wireguard][:enabled]
       }
     end
 
       }
     end
 
-    search(:node, "roles:mail") do |server|
+    search(:node, "roles:mail OR roles:prometheus") do |server|
       allowed_ips = server.interfaces(:role => :internal).map do |interface|
         "#{interface[:network]}/#{interface[:prefix]}"
       end
       allowed_ips = server.interfaces(:role => :internal).map do |interface|
         "#{interface[:network]}/#{interface[:prefix]}"
       end
@@ -368,6 +368,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"