X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e936bc87af74e629f14f70337f2bf8e19b79ccc3..3d489277de8fa3a6190655ed1ab0e9d8357e4c48:/cookbooks/piwik/recipes/default.rb diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb index 8561491b2..ecc6e2023 100644 --- a/cookbooks/piwik/recipes/default.rb +++ b/cookbooks/piwik/recipes/default.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,7 +17,7 @@ # limitations under the License. # -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "mysql" passwords = data_bag_item("piwik", "passwords") @@ -44,7 +44,7 @@ directory "/opt/piwik-#{version}" do end remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do - source "http://builds.piwik.org/piwik-#{version}.zip" + source "https://builds.matomo.org/piwik-#{version}.zip" not_if { File.exist?("/opt/piwik-#{version}/piwik") } end @@ -93,7 +93,6 @@ end ssl_certificate "piwik.openstreetmap.org" do domains ["piwik.openstreetmap.org", "piwik.osm.org"] - fallback_certificate "openstreetmap" notifies :reload, "service[apache2]" end