Merge pull request #236 from Tigerfell/master

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 3d742bf5fcb018f576ffa14f8d1e86d5c8f2c236..ec985da04a56922af308e3b56770e18e738b8064 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -6,21 +6,6 @@ default_attributes(
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
-  :munin => {
-    :graphs => {
-      :apcpdu_ucl => {
-        :title => "Current for UCL",
-        :vlabel => "Amps",
-        :category => "Ups",
-        :values => {
-          :load => {
-            :sum => ["apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load"],
-            :label => "Load"
-          }
-        }
-      }
-    }
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -88,6 +73,7 @@ run_list(
   "role[otrs]",
   "role[donate]",
   "recipe[hot]",
+  "recipe[dmca]",
   "recipe[dhcpd]",
   "recipe[openvpn]"
 )