Format, add user account request form

[chef.git] / roles / clifford.rb

diff --git a/roles/clifford.rb b/roles/clifford.rb
index 6a760954936ffaa5fee9f9b9f7188b06bec47fab..2471257396b027f3aafb55242c810179ae47d056 100644 (file)
--- a/roles/clifford.rb
+++ b/roles/clifford.rb
@@ -2,16 +2,25 @@ 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 => "enp2s0f0",
+        :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 => "enp2s0f1",
+        :interface => "enp2s0f0.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.11"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.11"


@@ -21,7 +30,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-dl360-g6]",
   "role[forum]"
 )
   "role[hp-dl360-g6]",
   "role[forum]"
 )