X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3535055f669970b9991c63487c27b9fe382a8c60..4c0a50ccc54784e4d6dc56d797bbb83a73ef99af:/cookbooks/mediawiki/resources/site.rb diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index e24d25353..323e33259 100644 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: mediawiki +# Cookbook:: mediawiki # Resource:: mediawiki_site # -# Copyright 2015, OpenStreetMap Foundation +# Copyright:: 2015, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ default_action :create -property :site, :kind_of => String, :name_attribute => true +property :site, :kind_of => String, :name_property => true property :aliases, :kind_of => [String, Array] property :directory, :kind_of => String property :version, :kind_of => String, :default => "1.33" @@ -109,6 +109,7 @@ action :create do action :sync repository "https://gerrit.wikimedia.org/r/p/mediawiki/core.git" revision mediawiki_reference + depth 1 user node[:mediawiki][:user] group node[:mediawiki][:group] notifies :run, "execute[#{mediawiki_directory}/composer.json]", :immediately @@ -196,13 +197,13 @@ action :create do end # MobileFrontend extension is required by MinervaNeue skin - mediawiki_extension "MobileFrontend" do # ~FC005 + mediawiki_extension "MobileFrontend" do site new_resource.site template "mw-ext-MobileFrontend.inc.php.erb" end # MobileFrontend extension is required by MinervaNeue skin - mediawiki_skin "MinervaNeue" do # ~FC005 + mediawiki_skin "MinervaNeue" do site new_resource.site update_site false legacy false @@ -418,7 +419,7 @@ action :create do mediawiki_extension "osmtaginfo" do site new_resource.site template "mw-ext-osmtaginfo.inc.php.erb" - repository "git://github.com/Firefishy/osmtaginfo.git" + repository "https://github.com/Firefishy/osmtaginfo.git" tag "live" update_site false end @@ -426,7 +427,7 @@ action :create do mediawiki_extension "SimpleMap" do site new_resource.site template "mw-ext-SimpleMap.inc.php.erb" - repository "git://github.com/Firefishy/SimpleMap.git" + repository "https://github.com/Firefishy/SimpleMap.git" tag "live" update_site false end @@ -434,7 +435,7 @@ action :create do mediawiki_extension "SlippyMap" do site new_resource.site template "mw-ext-SlippyMap.inc.php.erb" - repository "git://github.com/Firefishy/SlippyMap.git" + repository "https://github.com/Firefishy/SlippyMap.git" tag "live" update_site false end