X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2c3bb4b02302a37e1c14e045833feb71b5a3130d..953568ac810971babd2c310ca6b8e1a0a30793a5:/roles/shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 9226ff0de..f91677226 100644
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -10,45 +10,39 @@ default_attributes(
     }
   },
   :hardware => {
-    :mcelog => {
-      :enabled => false
+    :hwmon => {
+      "platform_it87_552" => {
+        :ignore => %w[in6]
+      }
     },
     :modules => [
       "it87"
     ]
   },
-  :openvpn => {
-    :address => "10.0.16.3",
-    :tunnels => {
-      :shenron2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      }
+  :prometheus => {
+    :metrics => {
+      :exim_queue_limit => { :metric => 250 }
     }
   }
 )
 
 override_attributes(
   :networking => {
+    :dnssec => "false",
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "eth0",
         :role => :external,
-        :family => :inet,
-        :address => "212.110.172.32",
-        :prefix => "26",
-        :gateway => "212.110.172.1"
-      },
-      :external_ipv6 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:41c9:1:400::32",
-        :prefix => "64",
-        :gateway => "fe80::1"
+        :inet => {
+          :address => "212.110.172.32",
+          :prefix => "26",
+          :gateway => "212.110.172.1"
+        },
+        :inet6 => {
+          :address => "2001:41c9:1:400::32",
+          :prefix => "64",
+          :gateway => "fe80::1"
+        }
       }
     }
   }
@@ -56,12 +50,6 @@ override_attributes(
 
 run_list(
   "role[bytemark]",
-  "role[mail]",
   "role[lists]",
-  "role[subversion]",
-  "role[trac]",
-  "role[osqa]",
-  "role[irc]",
-  "recipe[blogs]",
-  "recipe[openvpn]"
+  "role[osqa]"
 )