nominatim: reorganise recipe for Debian installation

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 347978935c5dc559c3364994db9ccb49f16c5726..52c993568f5fd4ddc96dd7d4a1acf60ee283f9f5 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -35,12 +35,19 @@ default_attributes(
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],

-        :host => ["spike-06.openstreetmap.org", "spike-07.openstreetmap.org", "spike-08.openstreetmap.org"]
+        :host => [
+          "spike-01.openstreetmap.org",
+          "spike-02.openstreetmap.org",
+          "spike-03.openstreetmap.org",
+          "spike-06.openstreetmap.org",
+          "spike-07.openstreetmap.org",
+          "spike-08.openstreetmap.org"
+        ]

       },
       :otrs => {
         :comment => "otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
       },
       :otrs => {
         :comment => "otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],

-        :host => "ridley.ucl.openstreetmap.org"
+        :host => "naga.dub.openstreetmap.org"

       },
       :join => {
         :comment => "join.osmfoundation.org",
       },
       :join => {
         :comment => "join.osmfoundation.org",


@@ -55,7 +62,7 @@ default_attributes(
       :community => {
         :comment => "community.openstreetmap.org",
         :domains => ["community.openstreetmap.org"],
       :community => {
         :comment => "community.openstreetmap.org",
         :domains => ["community.openstreetmap.org"],

-        :host => "jakelong.dub.openstreetmap.org::2500"
+        :host => "fume.dub.openstreetmap.org::2500"

       }
     },
     :dkim_selectors => {
       }
     },
     :dkim_selectors => {


@@ -69,7 +76,6 @@ default_attributes(
       "clamav" => "root",
       "rails" => "root",
       "trac" => "root",
       "clamav" => "root",
       "rails" => "root",
       "trac" => "root",

-      "munin" => "root",

       "prometheus" => "root",
       "www-data" => "root",
       "osmbackup" => "root",
       "prometheus" => "root",
       "www-data" => "root",
       "osmbackup" => "root",


@@ -91,16 +97,6 @@ default_attributes(
     },
     :private_aliases => "mail"
   },
     },
     :private_aliases => "mail"
   },

-  :munin => {
-    :plugins => {
-      :exim_mailqueue => {
-        :mails => {
-          :warning => 500,
-          :critical => 1000
-        }
-      }
-    }
-  },

   :prometheus => {
     :metrics => {
       :exim_queue_limit => { :metric => 2500 }
   :prometheus => {
     :metrics => {
       :exim_queue_limit => { :metric => 2500 }