Enable GPX upload for dev apis using the job queue

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index d8e6b5b5082aeb8d9afd756bc52a0b758c0ff417..297a610c383b25f3dc576796e31be6aa336aafb9 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -2,61 +2,42 @@ name "fafnir"
 description "Master role applied to fafnir"
 
 default_attributes(
-  :db => {
-    :cluster => "9.1/main"
-  },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "172.31.10.210",
-        :hwaddress => "02:c1:c5:8b:5f:1d"
-      },
       :external_ipv4 => {
+        :interface => "enp3s0f0",
         :role => :external,
         :family => :inet,
-        :address => "52.50.86.69"
-      }
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.4",
-    :tunnels => {
-      :aws2ic => {
-        :port => "1194",
-        :mode => "client",
-        :peer => {
-          :host => "ironbelly.openstreetmap.org",
-          :port => "1195"
-        }
+        :address => "130.239.18.114",
+        :prefix => "27",
+        :gateway => "130.239.18.97"
+      },
+      :external_ipv6 => {
+        :interface => "enp3s0f0",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:6b0:e:2a18::114",
+        :prefix => "64",
+        :gateway => "fe80::5a97:bdff:fe79:dbc0"
       }
     }
   },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :shared_buffers => "64GB",
-        :work_mem => "64MB",
-        :maintenance_work_mem => "1GB",
-        :effective_cache_size => "180GB"
-      }
-    }
+  :squid => {
+    :cache_mem => "28000 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 66 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
-      }
-    }
+  :tilecache => {
+    :tile_parent => "sweden.render.openstreetmap.org",
+    :tile_siblings => [
+      "nidhogg.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "rimfaxe.openstreetmap.org",
+      "trogdor.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[aws]",
-  "role[db-slave]",
-  "recipe[openvpn]"
+  "role[umu]",
+  "role[tilecache]"
 )