Add squid2 and squid3 repositories and install the correct one

[chef.git] / roles / ic.rb

diff --git a/roles/ic.rb b/roles/ic.rb
index 369380956b161a16a29c483c35a80c0177109495..33e99624b2f17f23fd99fd2538aa0ef19f885ec5 100644 (file)
--- a/roles/ic.rb
+++ b/roles/ic.rb
@@ -8,12 +8,12 @@ default_attributes(
     }
   },
   :networking => {
-    :nameservers => [ "146.179.159.164" ],
+    :nameservers => ["8.8.8.8", "146.179.159.177"],
     :roles => {
       :internal => {
         :inet => {
           :prefix => "27",
-          :gateway => "146.179.159.164"
+          :gateway => "146.179.159.177"
         }
       },
       :external => {
@@ -28,15 +28,20 @@ default_attributes(
         }
       }
     }
+  },
+  :web => {
+    :backends => %w[rails1 rails2 rails3],
+    :fileserver => "ironbelly",
+    :readonly_database_host => "karm.ic.openstreetmap.org"
   }
 )
 
 override_attributes(
   :networking => {
-    :search => [ "ic.openstreetmap.org", "openstreetmap.org" ]
+    :search => ["ic.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
-    :servers => [ "0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org" ]
+    :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"]
   }
 )