diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index a16bdfe..b459914 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb @@ -30,10 +30,10 @@ include_recipe 'composer' server_name = 'wiki.kosmos.org' -node.override['mediawiki']['version'] = "1.32.0" +node.override['mediawiki']['version'] = "1.34.2" node.override['mediawiki']['webdir'] = "#{node['mediawiki']['docroot_dir']}/mediawiki-#{node['mediawiki']['version']}" node.override['mediawiki']['tarball']['name'] = "mediawiki-#{node['mediawiki']['version']}.tar.gz" -node.override['mediawiki']['tarball']['url'] = "https://releases.wikimedia.org/mediawiki/1.32/#{node['mediawiki']['tarball']['name']}" +node.override['mediawiki']['tarball']['url'] = "https://releases.wikimedia.org/mediawiki/1.34/#{node['mediawiki']['tarball']['name']}" node.override['mediawiki']['language_code'] = 'en' node.override['mediawiki']['server_name'] = server_name node.override['mediawiki']['site_name'] = 'Kosmos Wiki' @@ -98,7 +98,8 @@ nginx_site server_name do action :enable end -nginx_certbot_site server_name +# TODO +# nginx_certbot_site server_name # # Extensions @@ -136,31 +137,28 @@ end if node["mediawiki"]["ldap_enabled"] # LDAP - ark "PluggableAuth" do - url "https://github.com/wikimedia/mediawiki-extensions-PluggableAuth/archive/REL1_32.zip" - path "#{node['mediawiki']['webdir']}/extensions" - owner node["nginx"]["user"] + git "#{node['mediawiki']['webdir']}/extensions/PluggableAuth" do + repository "https://github.com/wikimedia/mediawiki-extensions-PluggableAuth.git" + revision "5.7" + user node["nginx"]["user"] group node["nginx"]["group"] - mode 0750 - action :dump + action :sync end - ark "LDAPProvider" do - url "https://github.com/wikimedia/mediawiki-extensions-LDAPProvider/archive/REL1_31.zip" - path "#{node['mediawiki']['webdir']}/extensions" - owner node["nginx"]["user"] + git "#{node['mediawiki']['webdir']}/extensions/LDAPProvider" do + repository "https://github.com/wikimedia/mediawiki-extensions-LDAPProvider.git" + revision "1.0.3" + user node["nginx"]["user"] group node["nginx"]["group"] - mode 0750 - action :dump + action :sync end - ark "LDAPAuthentication2" do - url "https://github.com/wikimedia/mediawiki-extensions-LDAPAuthentication2/archive/REL1_31.zip" - path "#{node['mediawiki']['webdir']}/extensions" - owner node["nginx"]["user"] + git "#{node['mediawiki']['webdir']}/extensions/LDAPAuthentication2" do + repository "https://github.com/wikimedia/mediawiki-extensions-LDAPAuthentication2.git" + revision "1.0.1" + user node["nginx"]["user"] group node["nginx"]["group"] - mode 0750 - action :dump + action :sync end package "php-ldap"