X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f5c209a2991b26130dcae5cfcc613be001f5106d..3262d4c8fb646329f3da06ac54e8e27d33f2e300:/cookbooks/mediawiki/resources/skin.rb?ds=sidebyside diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb index a80827340..15ab63946 100644 --- a/cookbooks/mediawiki/resources/skin.rb +++ b/cookbooks/mediawiki/resources/skin.rb @@ -17,6 +17,8 @@ # limitations under the License. # +unified_mode true + default_action :create property :skin, :kind_of => String, :name_property => true @@ -37,10 +39,10 @@ action :create do source new_resource.source owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o755 + mode "755" files_owner node[:mediawiki][:user] files_group node[:mediawiki][:group] - files_mode 0o755 + files_mode "755" end else skin_repository = new_resource.repository || default_repository @@ -63,7 +65,7 @@ action :create do source new_resource.template user node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o664 + mode "664" variables new_resource.variables end else @@ -79,7 +81,7 @@ action :create do content file_content user node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o664 + mode "664" only_if { ::File.exist?(skin_file) } end end @@ -119,12 +121,5 @@ action_class do end def after_created - if update_site - notifies :update, "mediawiki_site[#{site}]" - else - site_directory = node[:mediawiki][:sites][site][:directory] - - notifies :create, "template[#{site_directory}/w/LocalSettings.php]" - notifies :run, "execute[#{site_directory}/w/maintenance/update.php]" - end + notifies :update, "mediawiki_site[#{site}]" if update_site end