Reconfigure stormfly-04 as a nominatim server

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 1694191e1f5b469306e93ce63dcaa641d1c1edfd..5042c4dd0547547d9d01e28a8abbab4fc2afc662 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,6 +5,9 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },

+  :bind => {
+    :clients => "equinix"
+  },

   :dhcpd => {
     :first_address => "10.0.63.1",
     :last_address => "10.0.63.254"
   :dhcpd => {
     :first_address => "10.0.63.1",
     :last_address => "10.0.63.254"


@@ -16,7 +19,8 @@ default_attributes(
           :disk => {
             :watermark => {
               :low => "95%",
           :disk => {
             :watermark => {
               :low => "95%",

-              :high => "98%"
+              :high => "98%",
+              :flood_stage => "99%"

             }
           }
         }
             }
           }
         }


@@ -26,21 +30,6 @@ default_attributes(
       :data => "/store/elasticsearch"
     }
   },
       :data => "/store/elasticsearch"
     }
   },

-  :munin => {
-    :graphs => {
-      :apcpdu_ams => {
-        :title => "Current for Amsterdam",
-        :vlabel => "Amps",
-        :category => "Ups",
-        :values => {
-          :load => {
-            :sum => ["apcpdu_pdu1.load", "apcpdu_pdu2.load"],
-            :label => "Load"
-          }
-        }
-      }
-    }
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {


@@ -66,35 +55,8 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :openvpn => {
-    :address => "10.0.16.2",
-    :tunnels => {
-      :ic2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      },
-      :aws2ic => {
-        :port => "1195",
-        :mode => "server",
-        :peer => {
-          :host => "fafnir.openstreetmap.org"
-        }
-      },
-      :ic2bm => {
-        :port => "1196",
-        :mode => "client",
-        :peer => {
-          :host => "grisu.openstreetmap.org",
-          :port => "1194"
-        }
-      }
-    }
-  },

   :planet => {
   :planet => {

-    :replication => "disabled"
+    :replication => "enabled"

   },
   :rsyncd => {
     :modules => {
   },
   :rsyncd => {
     :modules => {


@@ -145,12 +107,9 @@ run_list(
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",

-  "role[stats]",

   "role[planet]",
   "role[planet]",

-  # "role[planetdump]",
-  "role[logstash]",
+  "role[planetdump]",

   "recipe[rsyncd]",
   "recipe[dhcpd]",
   "recipe[rsyncd]",
   "recipe[dhcpd]",

-  "recipe[openvpn]",

   "recipe[tilelog]"
 )
   "recipe[tilelog]"
 )