X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cf074f83728ffa2fdc43cf10f0dca5a4b443a29e..200f486870c88f3916ede7bcb36b47b374a63901:/cookbooks/mediawiki/resources/site.rb

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index f27c150f5..0bbddfe81 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -23,8 +23,7 @@ default_action :create
 
 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.37"
+property :version, :kind_of => String, :default => "1.39"
 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => [:create, :update]
 property :database_password, :kind_of => String, :required => [:create, :update]
@@ -61,6 +60,7 @@ action :create do
 
   mysql_user "#{new_resource.database_user}@localhost" do
     password new_resource.database_password
+    reload true
   end
 
   mysql_database new_resource.database_name do
@@ -162,11 +162,6 @@ action :create do
     only_if { ::File.exist?("#{mediawiki_directory}/LocalSettings.php") }
   end
 
-  service "mediawiki-refresh-links@#{new_resource.site}.timer" do
-    action [:enable, :start]
-    only_if { ::File.exist?("#{mediawiki_directory}/LocalSettings.php") }
-  end
-
   template "/etc/cron.daily/mediawiki-#{cron_name}-backup" do
     cookbook "mediawiki"
     source "mediawiki-backup.cron.erb"
@@ -343,10 +338,10 @@ action :create do
     update_site false
   end
 
+  # Extension has been archived: https://www.mediawiki.org/wiki/Extension:LocalisationUpdate
   mediawiki_extension "LocalisationUpdate" do
     site new_resource.site
-    template "mw-ext-LocalisationUpdate.inc.php.erb"
-    update_site false
+    action :delete
   end
 
   # mediawiki_extension "Translate" do
@@ -531,6 +526,7 @@ action :update do
     cwd mediawiki_directory
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
+    timeout 86400
   end
 end
 
@@ -558,7 +554,7 @@ action_class do
   include OpenStreetMap::Mixin::PersistentToken
 
   def site_directory
-    new_resource.directory || "/srv/#{new_resource.site}"
+    "/srv/#{new_resource.site}"
   end
 
   def mediawiki_reference