imagery: increase gdal memory allowance

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 13ba3dafd72cc73d2553bf4db136c521f00268ae..ec985da04a56922af308e3b56770e18e738b8064 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,33 +2,10 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
 description "Master role applied to ridley"
 
 default_attributes(

-  :ssl => {
-    :certificates => %w(osmfoundation openstreetmap)
-  },
-  :apache => {
-    :ssl => {
-      :certificate => "osmfoundation"
-    }
-  },

   :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 => {


@@ -95,6 +72,8 @@ run_list(
   "role[blog]",
   "role[otrs]",
   "role[donate]",
   "role[blog]",
   "role[otrs]",
   "role[donate]",

+  "recipe[hot]",
+  "recipe[dmca]",

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