X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1c848471a16f9d1ee1fc8a327af110447ea1ef4c..f0703bc0c5face0c6a1476ea195f5b709259e39a:/cookbooks/web/definitions/rails_port.rb

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index 48606f7b2..ba022fc3c 100644
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+require "yaml"
+
 define :rails_port, :action => [ :create, :enable ] do
   name = params[:name]
   ruby_version = params[:ruby] || "1.9.1"
@@ -41,6 +43,7 @@ define :rails_port, :action => [ :create, :enable ] do
   package "rubygems#{ruby_version}"
   package "irb#{ruby_version}"
   package "imagemagick"
+  package "nodejs"
 
   package "g++"
   package "libpq-dev"
@@ -51,6 +54,7 @@ define :rails_port, :action => [ :create, :enable ] do
 
   gem_package "bundler#{ruby_version}" do
     package_name "bundler"
+    version "1.3.5"
     gem_binary "gem#{ruby_version}"
     options "--format-executable"
   end
@@ -75,6 +79,7 @@ define :rails_port, :action => [ :create, :enable ] do
   execute "#{rails_directory}/public/assets" do
     action :nothing
     command "rake#{ruby_version} assets:precompile"
+    environment "RAILS_ENV" => "production"
     cwd rails_directory
     user rails_user
     group rails_group
@@ -204,17 +209,26 @@ define :rails_port, :action => [ :create, :enable ] do
       line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
       line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
 
-      if params[:piwik_location]
-        line.gsub!(/^( *)#piwik_location:.*$/, "\\1piwik_location: \"#{params[:piwik_location]}\"")
-        line.gsub!(/^( *)#piwik_site:.*$/, "\\1piwik_site: #{params[:piwik_site]}")
-        line.gsub!(/^( *)#piwik_signup_goal:.*$/, "\\1piwik_signup_goal: #{params[:piwik_signup_goal]}")
-      end
-
       line
     end
     notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
   end
 
+  if params[:piwik_configuration]
+    file "#{rails_directory}/config/piwik.yml" do
+      owner rails_user
+      group rails_group
+      mode 0664
+      content YAML.dump(params[:piwik_configuration])
+      notifies :run, resources(:execute => "#{rails_directory}/public/assets")
+    end
+  else
+    file "#{rails_directory}/config/piwik.yml" do
+      action :delete
+      notifies :run, resources(:execute => "#{rails_directory}/public/assets")
+    end
+  end
+
   execute "#{rails_directory}/lib/quad_tile/extconf.rb" do
     command "ruby extconf.rb"
     cwd "#{rails_directory}/lib/quad_tile"