Try and ensure tile server use an integer number of listen buckets

[chef.git] / cookbooks / web / resources / rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 4825307b2039aaa81b9cc208dfd10136503a2928..3854235283769dcaff466a2834ab4d09254cd829 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -61,8 +61,8 @@ property :google_auth_secret, String
 property :google_openid_realm, String
 property :facebook_auth_id, String
 property :facebook_auth_secret, String
 property :google_openid_realm, String
 property :facebook_auth_id, String
 property :facebook_auth_secret, String

-property :windowslive_auth_id, String
-property :windowslive_auth_secret, String
+property :microsoft_auth_id, String
+property :microsoft_auth_secret, String

 property :github_auth_id, String
 property :github_auth_secret, String
 property :wikipedia_auth_id, String
 property :github_auth_id, String
 property :github_auth_secret, String
 property :wikipedia_auth_id, String


@@ -86,6 +86,10 @@ property :trace_image_storage_url, String
 property :trace_icon_storage_url, String
 property :tile_cdn_url, String
 property :imagery_blacklist, Array
 property :trace_icon_storage_url, String
 property :tile_cdn_url, String
 property :imagery_blacklist, Array

+property :signup_ip_per_day, Integer
+property :signup_ip_max_burst, Integer
+property :signup_email_per_day, Integer
+property :signup_email_max_burst, Integer

 
 action :create do
   package %W[
 
 action :create do
   package %W[


@@ -241,9 +245,9 @@ action :create do
       line.gsub!(/^( *)#facebook_auth_secret:.*$/, "\\1facebook_auth_secret: \"#{new_resource.facebook_auth_secret}\"")
     end
 
       line.gsub!(/^( *)#facebook_auth_secret:.*$/, "\\1facebook_auth_secret: \"#{new_resource.facebook_auth_secret}\"")
     end
 

-    if new_resource.windowslive_auth_id
-      line.gsub!(/^( *)#windowslive_auth_id:.*$/, "\\1windowslive_auth_id: \"#{new_resource.windowslive_auth_id}\"")
-      line.gsub!(/^( *)#windowslive_auth_secret:.*$/, "\\1windowslive_auth_secret: \"#{new_resource.windowslive_auth_secret}\"")
+    if new_resource.microsoft_auth_id
+      line.gsub!(/^( *)#microsoft_auth_id:.*$/, "\\1microsoft_auth_id: \"#{new_resource.microsoft_auth_id}\"")
+      line.gsub!(/^( *)#microsoft_auth_secret:.*$/, "\\1microsoft_auth_secret: \"#{new_resource.microsoft_auth_secret}\"")

     end
 
     if new_resource.github_auth_id
     end
 
     if new_resource.github_auth_id


@@ -314,8 +318,8 @@ action :create do
     "google_openid_realm",
     "facebook_auth_id",
     "facebook_auth_secret",
     "google_openid_realm",
     "facebook_auth_id",
     "facebook_auth_secret",

-    "windowslive_auth_id",
-    "windowslive_auth_secret",
+    "microsoft_auth_id",
+    "microsoft_auth_secret",

     "github_auth_id",
     "github_auth_secret",
     "wikipedia_auth_id",
     "github_auth_id",
     "github_auth_secret",
     "wikipedia_auth_id",


@@ -336,7 +340,11 @@ action :create do
     "trace_image_storage_url",
     "trace_icon_storage_url",
     "tile_cdn_url",
     "trace_image_storage_url",
     "trace_icon_storage_url",
     "tile_cdn_url",

-    "imagery_blacklist"
+    "imagery_blacklist",
+    "signup_ip_per_day",
+    "signup_ip_max_burst",
+    "signup_email_per_day",
+    "signup_email_max_burst"

   ).compact.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,
   ).compact.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,