Add squid2 and squid3 repositories and install the correct one

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 1dc5146a10256a4212f35b3e8a2ea23156c90b45..8bb55527cb48784503fba12dd948ea203f9b59ad 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -4,22 +4,32 @@ description "Master role applied to ascalon"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :external_ipv4 => {
         :interface => "eth0",
-        :role => :internal,
+        :role => :external,
         :family => :inet,
-        :address => "10.0.0.18"
+        :address => "184.107.48.228",
+        :prefix => "27",
+        :gateway => "184.107.48.225"
       }
     }
   },
-  :accounts => {
-    :users => {
-      :emacsen => { :status => :administrator }
-    }
+  :squid => {
+    :version => "3",
+    :cache_mem => "16000 MB",
+    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"
+  },
+  :tilecache => {
+    :tile_parent => "montreal.render.openstreetmap.org",
+    :tile_siblings => [
+      "stormfly-02.openstreetmap.org",
+      "jakelong.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[ucl-internal]",
-  "role[roundup]"
+  "role[netalerts]",
+  "role[geodns]",
+  "role[tilecache]"
 )