Revert "Switch web site to readonly against karm"

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 6363bdfd6bc91f5e7a597418b56a640243c9127d..696ee3f560fc4dbf3a6f2e1d30651434c234e145 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -36,7 +36,7 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
-          :slaves => %w[eth0 eth1]
+          :slaves => %w[enp2s0f0 enp2s0f1]
         }
       },
       :external => {
@@ -67,11 +67,13 @@ default_attributes(
     }
   },
   :nginx => {
-    :proxy => {
-        :enable => true,
-        :keys_zone => "proxy_cache_zone:256M",
-        :inactive => "180d",
-        :max_size => "51200M"
+    :cache => {
+      :proxy => {
+          :enable => true,
+          :keys_zone => "proxy_cache_zone:256M",
+          :inactive => "180d",
+          :max_size => "51200M"
+      }
     }
   },
   :rsyncd => {
@@ -109,5 +111,6 @@ run_list(
   "role[gateway]",
   "recipe[rsyncd]",
   "recipe[dhcpd]",
-  "recipe[imagery::za_ngi_aerial]"
+  "recipe[imagery::za_ngi_aerial]",
+  "recipe[imagery::us_imagery]"
 )