Drop mail gateway role from shenron

diff --git a/roles/lists.rb b/roles/lists.rb
index 991dfa04e124d0b642476ab413079ade117bb35f..e637b48c93a5a92cee75ea787dfaf3eae07f09d5 100644 (file)
--- a/roles/lists.rb
+++ b/roles/lists.rb
@@ -5,7 +5,10 @@ default_attributes(
   :exim => {
     :aliases => {
       "mailman-loop" => "/dev/null"
-    }
+    },
+    :local_domain => [
+      "openstreetmap.org"
+    ]
   }
 )
 

diff --git a/roles/shenron.rb b/roles/shenron.rb
index c82e4cd211adfa60ee3cd3fbc92385b1d9a6e841..7bd9acf48c0d6cccce4502e64ab8c84ef71d377c 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -49,7 +49,6 @@ override_attributes(
 
 run_list(
   "role[bytemark]",
-  "role[mail]",
   "role[lists]",
   "role[osqa]"
 )