From e2cbf44f9da7d166987294c476df694215880712 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 26 Aug 2013 16:54:15 +0100 Subject: [PATCH] Remove old style piwik configuration --- cookbooks/web/definitions/rails_port.rb | 6 ------ cookbooks/web/recipes/rails.rb | 3 --- 2 files changed, 9 deletions(-) diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index ccf6633ba..a6bf96963 100644 --- 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 23624b17e..ca27a5081 100644 --- 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 -- 2.43.2