Add IPv6 addresses to dulcy

[chef.git] / cookbooks / prometheus / recipes / server.rb

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index d16d47fda8dfb44ea9aa2b56b868bd94907abf60..4b9058c8eb5964dafd855879eafc272256891e35 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -363,7 +363,7 @@ apache_module "proxy_http"
 apache_module "proxy_wstunnel"
 
 ssl_certificate "prometheus.openstreetmap.org" do
-  domains ["prometheus.openstreetmap.org", "prometheus.osm.org"]
+  domains ["prometheus.openstreetmap.org", "prometheus.osm.org", "munin.openstreetmap.org", "munin.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
@@ -409,7 +409,10 @@ systemd_service "prometheus-backup-data" do
   description "Backup prometheus data to S3"
   user "prometheus"
   exec_start "/usr/local/bin/prometheus-backup-data"
-  read_write_paths "/var/lib/prometheus/metrics2/snapshots"
+  read_write_paths %w[
+    /var/lib/prometheus/.aws
+    /var/lib/prometheus/metrics2/snapshots
+  ]
   sandbox :enable_network => true
 end
 
@@ -417,3 +420,7 @@ systemd_timer "prometheus-backup-data" do
   description "Backup prometheus data to S3"
   on_calendar "03:11"
 end
+
+service "prometheus-backup-data.timer" do
+  action [:enable, :start]
+end