Generate new style piwik configuration

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index a51484b1f7dd32bda8e6feb60339004b43c47ad3..ccf6633ba0182a439d659e286038383f5e14bb9f 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+require "yaml"
+

 define :rails_port, :action => [ :create, :enable ] do
   name = params[:name]
   ruby_version = params[:ruby] || "1.9.1"
 define :rails_port, :action => [ :create, :enable ] do
   name = params[:name]
   ruby_version = params[:ruby] || "1.9.1"


@@ -217,6 +219,21 @@ define :rails_port, :action => [ :create, :enable ] do
     notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
   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"
   execute "#{rails_directory}/lib/quad_tile/extconf.rb" do
     command "ruby extconf.rb"
     cwd "#{rails_directory}/lib/quad_tile"

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index cd8bb9b568bda3d08530626a50cdcdc6e75bf798..23624b17ea3c05e6bdb694e84a9711dcdd11df6c 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -61,6 +61,10 @@ end
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
 
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
 

+piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k,v|
+  ["chef_type", "data_bag", "id"].include?(k)
+end
+

 rails_port "www.openstreetmap.org" do
   ruby node[:web][:ruby_version]
   directory rails_directory
 rails_port "www.openstreetmap.org" do
   ruby node[:web][:ruby_version]
   directory rails_directory


@@ -89,4 +93,5 @@ rails_port "www.openstreetmap.org" do
   piwik_location "piwik.openstreetmap.org"
   piwik_site 1
   piwik_signup_goal 1
   piwik_location "piwik.openstreetmap.org"
   piwik_site 1
   piwik_signup_goal 1

+  piwik_configuration piwik_configuration

 end
 end