Add missing comma

[chef.git] / roles / nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index d05a86df14abb0376caa2fc2a2258ed2853fa450..474a43e83220dfa6a268abd16b9f3f1a175d70d1 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -3,60 +3,38 @@ description "Master role applied to nepomuk"
 
 default_attributes(
   :networking => {
 
 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 => {
     :interfaces => {

-      :external_ipv4 => {
+      :external => {

         :interface => "eth0",
         :role => :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 => "2a03:9180:1:21::a6",
-        :prefix => "64",
-        :gateway => "2a03:9180:1:21::a1"
-      }
-    }
-  },
-  :sysctl => {
-    :kvm => {
-      :comment => "Tuning for KVM guest",
-      :parameters => {
-        "kernel.sched_min_granularity_ns" => 10000000,
-        "kernel.sched_wakeup_granularity_ns" => 15000000
+        :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 => {
   :sysfs => {
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
       :parameters => {

-        "block/vda/queue/nr_requests" => "128",
-        "block/vda/queue/scheduler" => "deadline"
+        "block/vda/queue/nr_requests" => "128"

       }
     }
       }
     }

-  },
-  :tilecache => {
-    :tile_parent => "lyon.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "tabaluga.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[lyonix]",
-  "role[tilecache]"
+  "role[lyonix]"

 )
 )