Make php::fpm enable FPM support in apache

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 9009c08245aabe597d4c4f1a10caf42ccedaf50a..c3db86355878f4cb3b0f1e17c460b59b6daa7007 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -9,9 +9,6 @@ default_attributes(
       :max_spare_threads => 150
     }
   },
       :max_spare_threads => 150
     }
   },

-  :apt => {
-    :sources => ["brightbox-ruby-ng"]
-  },

   :hardware => {
     :mcelog => {
       :enabled => false
   :hardware => {
     :mcelog => {
       :enabled => false


@@ -53,7 +50,8 @@ override_attributes(
         :prefix => "64",
         :gateway => "fe80::1"
       }
         :prefix => "64",
         :gateway => "fe80::1"
       }

-    }
+    },
+    :nameservers => ["89.16.162.20", "2001:41c9:2:d6::20"]

   }
 )
 
   }
 )
 


@@ -65,7 +63,6 @@ run_list(
   "role[trac]",
   "role[osqa]",
   "role[irc]",
   "role[trac]",
   "role[osqa]",
   "role[irc]",

-  "role[geodns]",

   "recipe[blogs]",
   "recipe[openvpn]"
 )
   "recipe[blogs]",
   "recipe[openvpn]"
 )