X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/960aab171789210b26f3e9b83319fc492b4eda43..5c316de4cdef360e538c18893e57edf9e17b37b7:/roles/nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 8a1c3679c..474a43e83 100644
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -3,41 +3,38 @@ description "Master role applied to nepomuk"
 
 default_attributes(
   :networking => {
+    :firewall => {
+      :incoming => [
+        "tcp sport { 1024-65535 } tcp dport { 5666 } ip saddr { 77.95.64.120, 77.95.64.131, 77.95.64.139 } ct state new accept"
+      ]
+    },
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "eth0",
         :role => :external,
-        :family => :inet,
-        :address => "77.95.70.166",
-        :prefix => "27",
-        :gateway => "77.95.70.161"
-      },
-      :external_ipv6 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:7f8:47:21::a6",
-        :prefix => "64",
-        :gateway => "2001:7f8:47:21::a1"
+        :inet => {
+          :address => "77.95.65.39",
+          :prefix => "27",
+          :gateway => "77.95.65.33"
+        },
+        :inet6 => {
+          :address => "2a03:9180:0:100::7",
+          :prefix => "64",
+          :gateway => "2a03:9180:0:100::1"
+        }
       }
     }
   },
-  :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
   :sysfs => {
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
       :parameters => {
-        "block/vda/queue/nr_requests" => "512",
-	"block/vda/queue/scheduler" => "noop"
+        "block/vda/queue/nr_requests" => "128"
       }
     }
   }
 )
 
 run_list(
-  "role[lyonix]",
-  "role[tilecache]"
+  "role[lyonix]"
 )