Use fonts-droid-fallback on Ubuntu 16.04

[chef.git] / cookbooks / mediawiki / providers / skin.rb

diff --git a/cookbooks/mediawiki/providers/skin.rb b/cookbooks/mediawiki/providers/skin.rb
index 2ee0504c747d39b499e5066697a86792bea0623a..f30495d571d6ea8d8ba1ee207c4bfc826a563cec 100644 (file)
--- a/cookbooks/mediawiki/providers/skin.rb
+++ b/cookbooks/mediawiki/providers/skin.rb
@@ -30,23 +30,19 @@ action :create do
       source new_resource.source
       owner node[:mediawiki][:user]
       group node[:mediawiki][:group]
       source new_resource.source
       owner node[:mediawiki][:user]
       group node[:mediawiki][:group]

-      mode 0755
+      mode 0o755

       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]
       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]

-      files_mode 0755
+      files_mode 0o755

     end
   else
     skin_repository = new_resource.repository || default_repository
     end
   else
     skin_repository = new_resource.repository || default_repository

-    skin_reference = if new_resource.tag
-                       "refs/tags/#{new_resource.tag}"
-                     else
-                       "REL#{skin_version}".tr(".", "_")
-                     end
+    skin_revision = new_resource.revision || "REL#{skin_version}".tr(".", "_")

 
     git skin_directory do
       action :sync
       repository skin_repository
 
     git skin_directory do
       action :sync
       repository skin_repository

-      reference skin_reference
+      revision skin_revision

       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]


@@ -60,7 +56,7 @@ action :create do
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]

-      mode 0664
+      mode 0o664

       variables new_resource.variables
     end
   else
       variables new_resource.variables
     end
   else


@@ -71,7 +67,7 @@ action :create do
       content "<?php require_once('#{skin_script}');\n"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       content "<?php require_once('#{skin_script}');\n"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]

-      mode 0664
+      mode 0o664

       only_if { ::File.exist?(skin_script) }
     end
   end
       only_if { ::File.exist?(skin_script) }
     end
   end