Switch fume to squid 4

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index fe8577d2cd1dc04355d7a9196a5e49e8b6b7ab75..37b6995c4e8e1548dc1f3c3b0ffa54daa1f6e639 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -61,19 +61,27 @@ default_attributes(
           :warning => 400,
           :critical => 500
         }
           :warning => 400,
           :critical => 500
         }

+      },
+      :sensors_temp => {
+        :temp1 => { :warning => 82 },
+        :temp2 => { :warning => 82 },
+        :temp3 => { :warning => 82 },
+        :temp4 => { :warning => 82 },
+        :temp5 => { :warning => 82 },
+        :temp6 => { :warning => 82 }

       }
     }
   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
       }
     }
   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0",
+        :interface => "eth0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.15"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.15"
       },
       :external_ipv4 => {

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

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


@@ -81,7 +89,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.5"],
+    :versions => ["10"],

     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",


@@ -101,14 +109,14 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "9.5/main"
+      :cluster => "10/main",
+      :postgis => "2.4"

     },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
         :tile_directories => [
     },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
         :tile_directories => [

-          { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 16 },
-          { :name => "/store/tiles/default-high", :min_zoom => 17, :max_zoom => 19 }
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }

         ]
       }
     }
         ]
       }
     }


@@ -116,7 +124,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[tyan-s7010]",
   "role[tile]"
 )
   "role[tyan-s7010]",
   "role[tile]"
 )