Revert "Update ascalon configuration for squid 3"

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 87b9ca26c7a637d95260421e9a0fc43cae6276c0..073bdcb2f2e515aeeddbaf69bac0dab8e474c033 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -4,27 +4,31 @@ description "Master role applied to ascalon"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.18"
-      },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth0",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.105"
+        :address => "184.107.48.228",
+        :prefix => "27",
+        :gateway => "184.107.48.225"
       }
     }
   },
-  :accounts => {
-    :users => {
-      :emacsen => { :status => :administrator }
-    }
+  :squid => {
+    :cache_mem => "16000 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "montreal.render.openstreetmap.org",
+    :tile_siblings => [
+      "stormfly-02.openstreetmap.org",
+      "jakelong.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[ucl-internal]"
+  "role[netalerts]",
+  "role[geodns]",
+  "role[tilecache]"
 )