nominatim: ruby packages needed for prometheus

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

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 71309e6090e12c44c744665da2b1ec0d1c0b45d6..7354e93d363d2daf763cfc096213db53f7e3e6a1 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "munin"

 include_recipe "networking"
 include_recipe "prometheus"
 
 include_recipe "networking"
 include_recipe "prometheus"
 


@@ -126,6 +125,19 @@ file "/etc/exim4/blocked-senders" do
   mode "644"
 end
 
   mode "644"
 end
 

+file "/etc/exim4/blocked-sender-domains" do
+  owner "root"
+  group "Debian-exim"
+  mode "644"
+end
+
+file "/etc/exim4/detaint" do
+  owner "root"
+  group "Debian-exim"
+  mode "644"
+  content "*"
+end
+

 if node[:exim][:dkim_selectors]
   keys = data_bag_item("exim", "dkim")
 
 if node[:exim][:dkim_selectors]
   keys = data_bag_item("exim", "dkim")
 


@@ -219,9 +231,6 @@ template "/etc/mail.rc" do
   mode "644"
 end
 
   mode "644"
 end
 

-munin_plugin "exim_mailqueue"
-munin_plugin "exim_mailstats"
-

 prometheus_exporter "exim" do
   port 9636
   user "Debian-exim"
 prometheus_exporter "exim" do
   port 9636
   user "Debian-exim"