Update piwik to 3.1.0

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

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index 06a68504b2847b9ec0b38f7e41bc1b6fa44dae0d..6d0c966abfff55308df752621c831c14ec4117d8 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -28,6 +28,7 @@ define :rails_port, :action => [:create, :enable] do
   rails_repository = params[:repository] || "git://git.openstreetmap.org/rails.git"
   rails_revision = params[:revision] || "live"
   run_migrations = params[:run_migrations] || false
   rails_repository = params[:repository] || "git://git.openstreetmap.org/rails.git"
   rails_revision = params[:revision] || "live"
   run_migrations = params[:run_migrations] || false

+  email_from = params[:email_from] || "OpenStreetMap <support@openstreetmap.org>"

   status = params[:status] || "online"
 
   database_params = {
   status = params[:status] || "online"
 
   database_params = {


@@ -109,12 +110,19 @@ define :rails_port, :action => [:create, :enable] do
   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|
   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|

+    line.gsub!(/^( *)server_protocol:.*$/, "\\1server_protocol: \"https\"")

     line.gsub!(/^( *)server_url:.*$/, "\\1server_url: \"#{name}\"")
 
     line.gsub!(/^( *)server_url:.*$/, "\\1server_url: \"#{name}\"")
 

+    line.gsub!(/^( *)#publisher_url:.*$/, "\\1publisher_url: \"https://plus.google.com/111953119785824514010\"")
+
+    line.gsub!(/^( *)support_email:.*$/, "\\1support_email: \"support@openstreetmap.org\"")
+

     if params[:email_from]
     if params[:email_from]

-      line.gsub!(/^( *)email_from:.*$/, "\\1email_from: \"#{params[:email_from]}\"")
+      line.gsub!(/^( *)email_from:.*$/, "\\1email_from: \"#{email_from}\"")

     end
 
     end
 

+    line.gsub!(/^( *)email_return_path:.*$/, "\\1email_return_path: \"bounces@openstreetmap.org\"")
+

     line.gsub!(/^( *)status:.*$/, "\\1status: :#{status}")
 
     if params[:messages_domain]
     line.gsub!(/^( *)status:.*$/, "\\1status: :#{status}")
 
     if params[:messages_domain]


@@ -204,6 +212,10 @@ define :rails_port, :action => [:create, :enable] do
       line.gsub!(/^( *)#thunderforest_key:.*$/, "\\1thunderforest_key: \"#{params[:thunderforest_key]}\"")
     end
 
       line.gsub!(/^( *)#thunderforest_key:.*$/, "\\1thunderforest_key: \"#{params[:thunderforest_key]}\"")
     end
 

+    if params[:totp_key]
+      line.gsub!(/^( *)#totp_key:.*$/, "\\1totp_key: \"#{params[:totp_key]}\"")
+    end
+

     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
 
     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")