Switch to custom PAM file for FTP

[chef.git] / roles / thorn-02.rb

diff --git a/roles/thorn-02.rb b/roles/thorn-02.rb
index c896b14cbcaced6ee75b2cc77ab759ec39922137..a3b1efb2258601e39e4dd8b7fadf9773c5cfcdfa 100644 (file)
--- a/roles/thorn-02.rb
+++ b/roles/thorn-02.rb
@@ -5,20 +5,28 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.166"
+        :address => "10.0.48.52",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
       }
     }
   },
-  :web => {
-    :readonly_database_host => "db-slave"
+  :sysctl => {
+    :ipv6_autoconf => {
+      :comment => "Disable IPv6 auto-configuration on internal interface",
+      :parameters => {
+        "net.ipv6.conf.eth0.autoconf" => "0",
+        "net.ipv6.conf.eth0.accept_ra" => "0"
+      }
+    }
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-g5]",
+  "role[equinix]",
   "role[web-backend]"
 )