X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f19359e475bf150c9e60c5fb142a9116962d0588..b2b40f7187850e6840f7f9a225801b26f3e33ec9:/roles/ascalon.rb?ds=inline

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 7f5e2bd71..f20cf2ec8 100644
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -2,24 +2,38 @@ name "ascalon"
 description "Master role applied to ascalon"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "20g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "eno1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.193"
+        :address => "184.107.48.228",
+        :prefix => "27",
+        :gateway => "184.107.48.225"
       }
     }
   },
-  :accounts => {
-    :users => {
-      :emacsen => { :status => :administrator }
-    }
+  :squid => {
+    :version => 4,
+    :cache_mem => "16384 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
+  },
+  :tilecache => {
+    :tile_parent => "montreal.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
-  "role[roundup]"
+  "role[netalerts]",
+  "role[geodns]",
+  "role[tilecache]"
 )