Switch jakelong to squid 4

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 3d742bf5fcb018f576ffa14f8d1e86d5c8f2c236..591f31ae2fd00fb7936f73a35e5b84313c03cb93 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,25 +2,13 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
 description "Master role applied to ridley"
 
 default_attributes(

+  :bind => {
+    :clients => "ucl"
+  },

   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
   :dhcpd => {
     :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 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -88,6 +76,7 @@ run_list(
   "role[otrs]",
   "role[donate]",
   "recipe[hot]",
   "role[otrs]",
   "role[donate]",
   "recipe[hot]",

+  "recipe[dmca]",

   "recipe[dhcpd]",
   "recipe[openvpn]"
 )
   "recipe[dhcpd]",
   "recipe[openvpn]"
 )