Add supporting.openstreetmap.org exim config

diff --git a/roles/crm.rb b/roles/crm.rb
index e4e7deb1bcbf27507e95af9760f8a296f2997741..cbcd8628d986cf5f967b87b940b22f3077b937c8 100644 (file)
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :exim => {
     }
   },
   :exim => {

-    :local_domains => ["join.osmfoundation.org"],
+    :local_domains => ["join.osmfoundation.org", "supporting.openstreetmap.org"],

     :routes => {
       :join_return => {
         :comment => "return@join.osmfoundation.org",
     :routes => {
       :join_return => {
         :comment => "return@join.osmfoundation.org",


@@ -25,6 +25,22 @@ default_attributes(
         :maildir => "/var/mail/crm-mail",
         :user => "www-data",
         :group => "mail"
         :maildir => "/var/mail/crm-mail",
         :user => "www-data",
         :group => "mail"

+      },
+      :supporting_return => {
+        :comment => "return@supporting.openstreetmap.org",
+        :domains => ["supporting.osmfoundation.org"],
+        :local_parts => ["return"],
+        :maildir => "/var/mail/crm-return",
+        :user => "www-data",
+        :group => "mail"
+      },
+      :supporting_mail => {
+        :comment => "mail@supporting.openstreetmap.org",
+        :domains => ["supporting.openstreetmap.org"],
+        :local_parts => ["mail"],
+        :maildir => "/var/mail/crm-mail",
+        :user => "www-data",
+        :group => "mail"

       }
     },
     :trusted_users => ["www-data"]
       }
     },
     :trusted_users => ["www-data"]

diff --git a/roles/mail.rb b/roles/mail.rb
index 5acd66a7b81e0e54b083794e3a5df7ab92fae49c..347978935c5dc559c3364994db9ccb49f16c5726 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -47,6 +47,11 @@ default_attributes(
         :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"
       },
         :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"
       },

+      :supporting => {
+        :comment => "supporting.openstreetmap.org",
+        :domains => ["supporting.openstreetmap.org"],
+        :host => "ridley.ucl.openstreetmap.org"
+      },

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