Revert "Fix bonding options on faffy"

[chef.git] / roles / clifford.rb

diff --git a/roles/clifford.rb b/roles/clifford.rb
index fbef667cc2f10625e5632d4660512d5408a86483..2471257396b027f3aafb55242c810179ae47d056 100644 (file)
--- a/roles/clifford.rb
+++ b/roles/clifford.rb
@@ -2,25 +2,35 @@ name "clifford"
 description "Master role applied to clifford"
 
 default_attributes(
 description "Master role applied to clifford"
 
 default_attributes(

+  :exim => {
+    :rewrites => [
+      {
+        :pattern => "www-data@openstreetmap.org",
+        :replacement => "forum@noreply.openstreetmap.org",
+        :flags => "F"
+      }
+    ]
+  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0",
+        :interface => "enp2s0f0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.17"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.17"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "enp2s0f0.2800",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "128.40.45.194"
+        :address => "193.60.236.11"

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[ucl-wolfson]",
+  "role[ucl]",
+  "role[hp-dl360-g6]",

   "role[forum]"
 )
   "role[forum]"
 )