Remove old style piwik configuration

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index ccf6633ba0182a439d659e286038383f5e14bb9f..a6bf9696351e1ab9a9c9b50f0102048ba20dc1c7 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -208,12 +208,6 @@ 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")

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 23624b17ea3c05e6bdb694e84a9711dcdd11df6c..ca27a5081d98478e0988c21b7de21c9408c196a7 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -90,8 +90,5 @@ rails_port "www.openstreetmap.org" do
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
-  piwik_location "piwik.openstreetmap.org"
-  piwik_site 1
-  piwik_signup_goal 1
   piwik_configuration piwik_configuration
 end