Enable promscale

[chef.git] / roles / nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 6f006744eabc5cda7496365bde61557e27b7861d..4035409b2bd1b11cc4c2e05e926c6c32a49e1503 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -3,25 +3,23 @@ description "Master role applied to nepomuk"
 
 default_attributes(
   :networking => {
 
 default_attributes(
   :networking => {

+    :firewall => {
+      :inet => [
+        {
+          :action => "ACCEPT",
+          :source => "net:77.95.64.120,77.95.64.131,77.95.64.139",
+          :dest => "fw",
+          :proto => "tcp",
+          :dest_ports => "5666",
+          :source_ports => "1024:",
+          :rate_limit => "-",
+          :connection_limit => "-"
+        }
+      ]
+    },

     :interfaces => {
     :interfaces => {

-      :external_ipv4_old => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet,
-        :address => "77.95.70.166",
-        :prefix => "27",
-        :gateway => "77.95.70.161"
-      },
-      :external_ipv6_old => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2a03:9180:1:21::a6",
-        :prefix => "64",
-        :gateway => "2a03:9180:1:21::a1"
-      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth0",

         :role => :external,
         :family => :inet,
         :address => "77.95.65.39",
         :role => :external,
         :family => :inet,
         :address => "77.95.65.39",


@@ -29,7 +27,7 @@ default_attributes(
         :gateway => "77.95.65.33"
       },
       :external_ipv6 => {
         :gateway => "77.95.65.33"
       },
       :external_ipv6 => {

-        :interface => "eth1",
+        :interface => "eth0",

         :role => :external,
         :family => :inet6,
         :address => "2a03:9180:0:100::7",
         :role => :external,
         :family => :inet6,
         :address => "2a03:9180:0:100::7",


@@ -47,32 +45,16 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :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",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

 )
 )