From: Tom Hughes <tom@compton.nu>
Date: Thu, 30 Jun 2016 18:58:40 +0000 (+0100)
Subject: Fix rubocop warnings
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f

Fix rubocop warnings
---

diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb
index bdb01eb9e..8ed05ff59 100644
--- a/cookbooks/accounts/recipes/default.rb
+++ b/cookbooks/accounts/recipes/default.rb
@@ -63,10 +63,10 @@ search(:accounts, "*:*").each do |account|
       source name.to_s
       owner name.to_s
       group name.to_s
-      mode 0755
+      mode 0o755
       files_owner name.to_s
       files_group name.to_s
-      files_mode 0644
+      files_mode 0o644
       only_if do
         begin
           cookbook = run_context.cookbook_collection[cookbook_name]
diff --git a/cookbooks/apache/providers/conf.rb b/cookbooks/apache/providers/conf.rb
index 9b9a7a174..16759e86f 100644
--- a/cookbooks/apache/providers/conf.rb
+++ b/cookbooks/apache/providers/conf.rb
@@ -45,7 +45,7 @@ def create_conf
     source new_resource.template
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.variables
   end
 end
diff --git a/cookbooks/apache/providers/module.rb b/cookbooks/apache/providers/module.rb
index c5efdd2c5..252b5e816 100644
--- a/cookbooks/apache/providers/module.rb
+++ b/cookbooks/apache/providers/module.rb
@@ -33,7 +33,7 @@ action :install do
       source new_resource.conf
       owner "root"
       group "root"
-      mode 0644
+      mode 0o644
       variables new_resource.variables
     end
   end
diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb
index 3913764da..4deae2782 100644
--- a/cookbooks/apache/providers/site.rb
+++ b/cookbooks/apache/providers/site.rb
@@ -29,7 +29,7 @@ action :create do
     source new_resource.template
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.variables.merge(:name => new_resource.name, :directory => site_directory)
   end
 end
diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index d9bcaba1b..a24ea18f2 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -43,7 +43,7 @@ template "/etc/apache2/ports.conf" do
   source "ports.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 service "apache2" do
diff --git a/cookbooks/apt/providers/source.rb b/cookbooks/apt/providers/source.rb
index 77a204bde..c12679f0d 100644
--- a/cookbooks/apt/providers/source.rb
+++ b/cookbooks/apt/providers/source.rb
@@ -35,7 +35,7 @@ action :create do
     source new_resource.template
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :url => new_resource.url
   end
 end
diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 6f36c099d..d5e002d61 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -33,7 +33,7 @@ template "/etc/apt/sources.list" do
   source "sources.list.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :run, "execute[apt-update]", :immediately
 end
 
@@ -132,7 +132,7 @@ auto_upgrades = if node[:apt][:unattended_upgrades][:enable]
 file "/etc/apt/apt.conf.d/20auto-upgrades" do
   user "root"
   group "root"
-  mode 0644
+  mode 0o644
   content auto_upgrades
 end
 
@@ -140,5 +140,5 @@ template "/etc/apt/apt.conf.d/60chef" do
   source "apt.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/backup/recipes/default.rb b/cookbooks/backup/recipes/default.rb
index 2c250917c..27d12eb9b 100644
--- a/cookbooks/backup/recipes/default.rb
+++ b/cookbooks/backup/recipes/default.rb
@@ -23,18 +23,18 @@ package "libdate-calc-perl"
 directory "/store/backup" do
   owner "osmbackup"
   group "osmbackup"
-  mode 02755
+  mode 0o2755
 end
 
 cookbook_file "/usr/local/bin/expire-backups" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.daily/expire-backups" do
   source "expire.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 519b9c823..3eda428c1 100644
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -30,7 +30,7 @@ template "/etc/bind/named.conf.local" do
   source "named.local.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[bind9]"
 end
 
@@ -38,7 +38,7 @@ template "/etc/bind/named.conf.options" do
   source "named.options.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[bind9]"
 end
 
@@ -46,7 +46,7 @@ template "/etc/bind/db.10" do
   source "db.10.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :reload, "service[bind9]"
 end
 
diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index b3bd0430c..02479580b 100644
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -26,7 +26,7 @@ passwords = data_bag_item("blog", "passwords")
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 wordpress_site "blog.openstreetmap.org" do
@@ -96,6 +96,6 @@ template "/etc/cron.daily/blog-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end
diff --git a/cookbooks/cgiirc/recipes/default.rb b/cookbooks/cgiirc/recipes/default.rb
index 9098d5a2b..5f6c0eced 100644
--- a/cookbooks/cgiirc/recipes/default.rb
+++ b/cookbooks/cgiirc/recipes/default.rb
@@ -27,14 +27,14 @@ template "/etc/cgiirc/cgiirc.config" do
   source "cgiirc.config.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/cgiirc/ipaccess" do
   source "ipaccess.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :blocks => blocks["addresses"]
 end
 
diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 938b7858b..af76dbebb 100644
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -22,7 +22,7 @@ chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb"
 directory "/var/cache/chef" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
@@ -38,7 +38,7 @@ remote_file "/var/cache/chef/#{chef_package}" do
   source "https://packages.chef.io/stable/ubuntu/10.04/#{chef_package}"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   backup false
   ignore_failure true
 end
@@ -51,59 +51,59 @@ end
 directory "/etc/chef" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/chef/client.rb" do
   source "client.rb.erb"
   owner "root"
   group "root"
-  mode 0640
+  mode 0o640
 end
 
 file "/etc/chef/client.pem" do
   owner "root"
   group "root"
-  mode 0400
+  mode 0o400
 end
 
 template "/etc/chef/report.rb" do
   source "report.rb.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/logrotate.d/chef" do
   source "logrotate.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/etc/chef/trusted_certs" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/chef/trusted_certs/verisign.pem" do
   source "verisign.pem.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory node[:ohai][:plugin_dir] do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/log/chef" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 if node[:lsb][:release].to_f >= 15.10
@@ -128,7 +128,7 @@ else
     source "chef-client.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
   end
 
   service "chef-client" do
diff --git a/cookbooks/chef/recipes/repository.rb b/cookbooks/chef/recipes/repository.rb
index 8c6bf236d..4eaa409bc 100644
--- a/cookbooks/chef/recipes/repository.rb
+++ b/cookbooks/chef/recipes/repository.rb
@@ -24,7 +24,7 @@ keys = data_bag_item("chef", "keys")
 directory "/var/lib/chef" do
   owner "chefrepo"
   group "chefrepo"
-  mode 02775
+  mode 0o2775
 end
 
 git "/var/lib/chef" do
@@ -38,33 +38,33 @@ end
 directory "/var/lib/chef/.chef" do
   owner "chefrepo"
   group "chefrepo"
-  mode 02775
+  mode 0o2775
 end
 
 file "/var/lib/chef/.chef/client.pem" do
   content keys["git"].join("\n")
   owner "chefrepo"
   group "chefrepo"
-  mode 0660
+  mode 0o660
 end
 
 cookbook_file "/var/lib/chef/.chef/knife.rb" do
   source "knife.rb"
   owner "chefrepo"
   group "chefrepo"
-  mode 0660
+  mode 0o660
 end
 
 template "#{node[:chef][:repository]}/hooks/post-receive" do
   source "post-receive.erb"
   owner "chefrepo"
   group "chefrepo"
-  mode 0750
+  mode 0o750
 end
 
 template "/etc/cron.daily/chef-repository-backup" do
   source "repository-backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 747014f9b..7a5f8fa5d 100644
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -54,7 +54,7 @@ template "/etc/opscode/chef-server.rb" do
   source "server.rb.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :run, "execute[chef-server-reconfigure]"
 end
 
@@ -86,14 +86,14 @@ template "/etc/cron.daily/chef-server-backup" do
   source "server-backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/logrotate.d/chef-server" do
   source "logrotate.server.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 munin_plugin "chef_status"
diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index cf46d686e..af1e644a8 100644
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -63,7 +63,7 @@ civicrm_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm"
 directory "/opt/civicrm-#{civicrm_version}" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 remote_file "/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip" do
@@ -71,7 +71,7 @@ remote_file "/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip" do
   source "https://download.civicrm.org/civicrm-#{civicrm_version}-wordpress.zip"
   owner "wordpress"
   group "wordpress"
-  mode 0644
+  mode 0o644
   backup false
 end
 
@@ -80,7 +80,7 @@ remote_file "/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz" do
   source "https://download.civicrm.org/civicrm-#{civicrm_version}-l10n.tar.gz"
   owner "wordpress"
   group "wordpress"
-  mode 0644
+  mode 0o644
   backup false
 end
 
@@ -114,7 +114,7 @@ end
 directory "/srv/join.osmfoundation.org/wp-content/plugins/files" do
   owner "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
 end
 
 extensions_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm-extensions"
@@ -122,7 +122,7 @@ extensions_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm-e
 directory extensions_directory do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 node[:civicrm][:extensions].each do |_, details|
@@ -157,7 +157,7 @@ end
 file "#{civicrm_directory}/civicrm.settings.php" do
   owner "wordpress"
   group "wordpress"
-  mode 0644
+  mode 0o644
   content settings
 end
 
@@ -165,7 +165,7 @@ template "/etc/cron.d/osmf-crm" do
   source "cron.erb"
   owner "root"
   group "root"
-  mode 0600
+  mode 0o600
   variables :directory => civicrm_directory, :passwords => passwords
 end
 
@@ -173,6 +173,6 @@ template "/etc/cron.daily/osmf-crm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end
diff --git a/cookbooks/db/recipes/backup.rb b/cookbooks/db/recipes/backup.rb
index 00da02911..aad515dd7 100644
--- a/cookbooks/db/recipes/backup.rb
+++ b/cookbooks/db/recipes/backup.rb
@@ -21,12 +21,12 @@ template "/usr/local/bin/backup-db" do
   source "backup-db.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.d/backup-db" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index d032fb64e..17dd43d11 100644
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -29,7 +29,7 @@ end
 
 directory "/srv/www.openstreetmap.org" do
   group "rails"
-  mode 02775
+  mode 0o2775
 end
 
 rails_port "www.openstreetmap.org" do
diff --git a/cookbooks/db/recipes/master.rb b/cookbooks/db/recipes/master.rb
index 4af5fdb5c..62ce2b4d7 100644
--- a/cookbooks/db/recipes/master.rb
+++ b/cookbooks/db/recipes/master.rb
@@ -87,5 +87,5 @@ template "/etc/cron.daily/rails-db" do
   source "cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 849830bc2..8d0a86e53 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -82,7 +82,7 @@ template "/etc/php5/fpm/pool.d/default.conf" do
   source "fpm-default.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :reload, "service[php5-fpm]"
 end
 
@@ -97,7 +97,7 @@ template "/etc/phppgadmin/config.inc.php" do
   source "phppgadmin.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 file "/etc/apache2/conf.d/phppgadmin" do
@@ -124,7 +124,7 @@ search(:accounts, "*:*").each do |account|
     source "fpm.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :user => name, :port => port
     notifies :reload, "service[php5-fpm]"
   end
@@ -139,7 +139,7 @@ search(:accounts, "*:*").each do |account|
     source "sudoers.user.erb"
     owner "root"
     group "root"
-    mode 0440
+    mode 0o440
     variables :user => name
   end
 end
@@ -154,7 +154,7 @@ if node[:postgresql][:clusters][:"9.3/main"]
     source "cleanup-assets.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
   end
 
   node[:dev][:rails].each do |name, details|
@@ -196,7 +196,7 @@ if node[:postgresql][:clusters][:"9.3/main"]
         source "rails.setup.rb.erb"
         owner "apis"
         group "apis"
-        mode 0644
+        mode 0o644
         variables :site => site_name
         notifies :run, "execute[#{rails_directory}]"
       end
@@ -231,14 +231,14 @@ if node[:postgresql][:clusters][:"9.3/main"]
   directory "/srv/apis.dev.openstreetmap.org" do
     owner "apis"
     group "apis"
-    mode 0755
+    mode 0o755
   end
 
   template "/srv/apis.dev.openstreetmap.org/index.html" do
     source "apis.html.erb"
     owner "apis"
     group "apis"
-    mode 0644
+    mode 0o644
   end
 
   apache_site "apis.dev.openstreetmap.org" do
diff --git a/cookbooks/devices/recipes/default.rb b/cookbooks/devices/recipes/default.rb
index 8a83da46b..18719778d 100644
--- a/cookbooks/devices/recipes/default.rb
+++ b/cookbooks/devices/recipes/default.rb
@@ -26,6 +26,6 @@ template "/etc/udev/rules.d/99-chef.rules" do
   source "udev.rules.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :run, "execute[udevadm-trigger]"
 end
diff --git a/cookbooks/dhcpd/recipes/default.rb b/cookbooks/dhcpd/recipes/default.rb
index 35f327d3c..6265f571f 100644
--- a/cookbooks/dhcpd/recipes/default.rb
+++ b/cookbooks/dhcpd/recipes/default.rb
@@ -27,7 +27,7 @@ template "/etc/dhcp/dhcpd.conf" do
   source "dhcpd.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :domain => domain
 end
 
diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 3ea745d3c..e2b41155d 100644
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -34,17 +34,17 @@ package "libjson-xs-perl"
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 remote_directory "/srv/dns.openstreetmap.org/html" do
   source "html"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0644
+  files_mode 0o644
 end
 
 zones = []
@@ -56,7 +56,7 @@ Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile|
     source "zone.html.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :zone => zone
   end
 
@@ -67,7 +67,7 @@ template "/srv/dns.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :zones => zones
 end
 
@@ -80,7 +80,7 @@ template "/usr/local/bin/dns-update" do
   source "dns-update.erb"
   owner "root"
   group "git"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end
 
@@ -94,7 +94,7 @@ end
 directory "/var/lib/dns" do
   owner "git"
   group "git"
-  mode 02775
+  mode 0o2775
   notifies :run, "execute[dns-update]"
 end
 
@@ -102,14 +102,14 @@ cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"
   group "git"
-  mode 0750
+  mode 0o750
 end
 
 template "/usr/local/bin/dns-check" do
   source "dns-check.erb"
   owner "root"
   group "git"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end
 
@@ -117,5 +117,5 @@ template "/etc/cron.d/dns" do
   source "cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/elasticsearch/recipes/default.rb b/cookbooks/elasticsearch/recipes/default.rb
index 3ade99c39..a40d45ce2 100644
--- a/cookbooks/elasticsearch/recipes/default.rb
+++ b/cookbooks/elasticsearch/recipes/default.rb
@@ -24,7 +24,7 @@ template "/etc/elasticsearch/elasticsearch.yml" do
   source "elasticsearch.yml.erb"
   user "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[elasticsearch]"
 end
 
diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 1bbd084ee..4e7c4638b 100644
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -37,7 +37,7 @@ template "/tmp/exim.ssl.cnf" do
   source "ssl.cnf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   not_if do
     File.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/etc/ssl/private/exim.key")
   end
@@ -76,7 +76,7 @@ template "/etc/exim4/exim4.conf" do
   source "exim4.conf.erb"
   owner "root"
   group "Debian-exim"
-  mode 0644
+  mode 0o644
   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort
   notifies :restart, "service[exim4]"
@@ -103,17 +103,17 @@ template "/etc/aliases" do
   source "aliases.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 remote_directory "/etc/exim4/noreply" do
   source "noreply"
   owner "root"
   group "Debian-exim"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "Debian-exim"
-  files_mode 0755
+  files_mode 0o755
   purge true
 end
 
diff --git a/cookbooks/fail2ban/providers/filter.rb b/cookbooks/fail2ban/providers/filter.rb
index 4e786770e..8c1c20e44 100644
--- a/cookbooks/fail2ban/providers/filter.rb
+++ b/cookbooks/fail2ban/providers/filter.rb
@@ -29,7 +29,7 @@ action :create do
       source new_resource.source
       owner "root"
       group "root"
-      mode 0644
+      mode 0o644
     end
   else
     template "/etc/fail2ban/filter.d/#{new_resource.name}.conf" do
@@ -37,7 +37,7 @@ action :create do
       source "filter.erb"
       owner "root"
       group "root"
-      mode 0644
+      mode 0o644
       variables :failregex => new_resource.failregex,
                 :ignoreregex => new_resource.ignoreregex
     end
diff --git a/cookbooks/fail2ban/providers/jail.rb b/cookbooks/fail2ban/providers/jail.rb
index d0e9dd5b3..8adcea11c 100644
--- a/cookbooks/fail2ban/providers/jail.rb
+++ b/cookbooks/fail2ban/providers/jail.rb
@@ -29,7 +29,7 @@ action :create do
     source "jail.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :name => new_resource.name,
               :filter => new_resource.filter,
               :logpath => new_resource.logpath,
diff --git a/cookbooks/fail2ban/recipes/default.rb b/cookbooks/fail2ban/recipes/default.rb
index 5ed1f3409..50b31d1b3 100644
--- a/cookbooks/fail2ban/recipes/default.rb
+++ b/cookbooks/fail2ban/recipes/default.rb
@@ -27,14 +27,14 @@ else
   directory "/etc/fail2ban/jail.d" do
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
   end
 
   template "/etc/fail2ban/jail.local" do
     source "jail.local.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     subscribes :create, "template[/etc/fail2ban/jail.d/00-default.conf]"
     notifies :reload, "service[fail2ban]"
   end
@@ -44,7 +44,7 @@ template "/etc/fail2ban/jail.d/00-default.conf" do
   source "jail.default.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :reload, "service[fail2ban]"
 end
 
diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index f3dc742b1..d21fd2534 100644
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -40,7 +40,7 @@ end
 directory "/srv/forum.openstreetmap.org" do
   owner "forum"
   group "forum"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/forum.openstreetmap.org/html/" do
@@ -55,13 +55,13 @@ end
 directory "/srv/forum.openstreetmap.org/html/cache/" do
   owner "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
 end
 
 directory "/srv/forum.openstreetmap.org/html/img/avatars/" do
   owner "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
 end
 
 mysql_user "forum@localhost" do
@@ -76,6 +76,6 @@ template "/etc/cron.daily/forum-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end
diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 1b1e48f64..390576f0c 100644
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -42,5 +42,5 @@ end
 cookbook_file "/srv/board.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index b89bfe192..a652d6ae8 100644
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -51,5 +51,5 @@ end
 cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 98e91a808..a0ee24646 100644
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -30,7 +30,7 @@ template "/etc/gdnsd/config" do
   source "config.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[gdnsd]"
 end
 
@@ -38,7 +38,7 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   source "geo.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[gdnsd]"
 end
 
diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 52d6304b0..822467d08 100644
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -25,7 +25,7 @@ git_directory = node[:git][:directory]
 directory git_directory do
   owner node[:git][:user]
   group node[:git][:group]
-  mode 02775
+  mode 0o2775
 end
 
 if node[:git][:allowed_nodes]
@@ -58,7 +58,7 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
     source "post-update.erb"
     owner "root"
     group node[:git][:group]
-    mode 0755
+    mode 0o755
   end
 
   next unless node[:recipes].include?("trac") && repository != "dns.git"
@@ -67,7 +67,7 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
     source "post-receive.erb"
     owner "root"
     group node[:git][:group]
-    mode 0755
+    mode 0o755
     variables :repository => "#{git_directory}/#{repository}"
   end
 end
@@ -76,13 +76,13 @@ template "/etc/cron.daily/git-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/xinetd.d/git" do
   source "xinetd.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :reload, "service[xinetd]"
 end
diff --git a/cookbooks/git/recipes/web.rb b/cookbooks/git/recipes/web.rb
index ef116d4e0..5a59e1c4b 100644
--- a/cookbooks/git/recipes/web.rb
+++ b/cookbooks/git/recipes/web.rb
@@ -29,7 +29,7 @@ template "/etc/gitweb.conf" do
   source "gitweb.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 apache_site node[:git][:host] do
@@ -41,5 +41,5 @@ template "#{git_directory}/robots.txt" do
   source "robots.txt.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb
index e4ac47d90..c3bcfba98 100644
--- a/cookbooks/gps-tile/recipes/default.rb
+++ b/cookbooks/gps-tile/recipes/default.rb
@@ -33,7 +33,7 @@ package "libcache-memcached-perl"
 directory "/srv/gps-tile.openstreetmap.org" do
   owner "gpstile"
   group "gpstile"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/gps-tile.openstreetmap.org/import" do
@@ -82,7 +82,7 @@ template "/etc/init.d/gps-update" do
   source "update.init.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 service "gps-update" do
@@ -95,10 +95,10 @@ remote_directory "/srv/gps-tile.openstreetmap.org/html" do
   source "html"
   owner "gpstile"
   group "gpstile"
-  mode 0755
+  mode 0o755
   files_owner "gpstile"
   files_group "gpstile"
-  files_mode 0644
+  files_mode 0o644
 end
 
 apache_module "headers"
diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index b108a3a96..13e24b80d 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -90,7 +90,7 @@ units.sort.uniq.each do |unit|
       source "tty.conf.erb"
       owner "root"
       group "root"
-      mode 0644
+      mode 0o644
       variables :unit => unit
     end
 
@@ -131,7 +131,7 @@ if File.exist?("/etc/default/grub")
     source "grub.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :units => units, :entry => grub_entry
     notifies :run, "execute[update-grub]"
   end
@@ -148,7 +148,7 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
   source "initramfs-mdadm.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :run, "execute[update-initramfs]"
 end
 
@@ -168,7 +168,7 @@ if node[:lsb][:release].to_f >= 12.10
     source "irqbalance.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
   end
 
   service "irqbalance" do
@@ -255,7 +255,7 @@ end
       source "raid.default.erb"
       owner "root"
       group "root"
-      mode 0644
+      mode 0o644
       variables :devices => status_packages[status_package]
     end
 
@@ -360,14 +360,14 @@ if disks.count > 0
     source "smartd-mailer.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
   end
 
   template "/etc/smartd.conf" do
     source "smartd.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :disks => disks
     notifies :reload, "service[smartmontools]"
   end
@@ -376,7 +376,7 @@ if disks.count > 0
     source "smartmontools.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[smartmontools]"
   end
 
@@ -435,7 +435,7 @@ if File.exist?("/etc/mdadm/mdadm.conf")
   file "/etc/mdadm/mdadm.conf" do
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     content mdadm_conf
   end
 
@@ -449,7 +449,7 @@ template "/etc/modules" do
   source "modules.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 if node[:lsb][:release].to_f <= 12.10
@@ -477,7 +477,7 @@ if node[:hardware][:watchdog]
     source "watchdog.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :module => node[:hardware][:watchdog]
   end
 
@@ -524,7 +524,7 @@ unless Dir.glob("/sys/class/hwmon/hwmon*").empty?
     source "sensors.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :run, "execute[/etc/sensors.d/chef.conf]"
   end
 end
diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index 946a4fdee..5a8e5517d 100644
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -43,21 +43,21 @@ package "unzip"
 directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   recursive true
 end
 
 directory "/srv/imagery/common" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   recursive true
 end
 
 directory "/srv/imagery/common/ostn02-ntv2-data" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 4e51cbee0..930d08919 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -44,7 +44,7 @@ action :create do
   file "/srv/imagery/layers/#{site}/#{layer}.yml" do
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     content YAML.dump(:name => layer,
                       :title => title || layer,
                       :url => "http://{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",
@@ -59,7 +59,7 @@ action :create do
     source "mapserver.map.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.to_hash
   end
 
@@ -90,7 +90,7 @@ action :create do
   directory "/srv/imagery/nginx/#{site}" do
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     recursive true
   end
 
@@ -99,7 +99,7 @@ action :create do
     source "nginx_imagery_layer_fragment.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.to_hash
   end
 end
diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 84151ae66..d0f51a0a6 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -30,20 +30,20 @@ action :create do
   directory "/srv/#{name}" do
     user "root"
     group "root"
-    mode 0755
+    mode 0o755
   end
 
   directory "/srv/imagery/layers/#{name}" do
     user "root"
     group "root"
-    mode 0755
+    mode 0o755
     recursive true
   end
 
   directory "/srv/imagery/overlays/#{name}" do
     user "root"
     group "root"
-    mode 0755
+    mode 0o755
     recursive true
   end
 
@@ -51,7 +51,7 @@ action :create do
     source "index.html.erb"
     user "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :title => title
   end
 
@@ -59,21 +59,21 @@ action :create do
     source "imagery.css"
     user "root"
     group "root"
-    mode 0644
+    mode 0o644
   end
 
   cookbook_file "/srv/#{name}/clientaccesspolicy.xml" do
     source "clientaccesspolicy.xml"
     user "root"
     group "root"
-    mode 0644
+    mode 0o644
   end
 
   cookbook_file "/srv/#{name}/crossdomain.xml" do
     source "crossdomain.xml"
     user "root"
     group "root"
-    mode 0644
+    mode 0o644
   end
 
   layers = Dir.glob("/srv/imagery/layers/#{name}/*.yml").collect do |path|
@@ -84,7 +84,7 @@ action :create do
     source "imagery.js.erb"
     user "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :bbox => bbox, :layers => layers
   end
 
diff --git a/cookbooks/incron/recipes/default.rb b/cookbooks/incron/recipes/default.rb
index 5423bc77a..de7a0f084 100644
--- a/cookbooks/incron/recipes/default.rb
+++ b/cookbooks/incron/recipes/default.rb
@@ -41,7 +41,7 @@ incrontabs.each do |user, lines|
   file "/var/spool/incron/#{user}" do
     owner user
     group "incron"
-    mode 0600
+    mode 0o600
     content lines.join("\n")
   end
 end
diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb
index 44ffb2983..e4dd05c9f 100644
--- a/cookbooks/kibana/recipes/default.rb
+++ b/cookbooks/kibana/recipes/default.rb
@@ -34,7 +34,7 @@ end
 directory "/opt/kibana-#{version}" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 execute "unzip-kibana-#{version}" do
@@ -48,19 +48,19 @@ end
 directory "/etc/kibana" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/run/kibana" do
   owner "kibana"
   group "kibana"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/log/kibana" do
   owner "kibana"
   group "kibana"
-  mode 0755
+  mode 0o755
 end
 
 systemd_service "kibana@" do
@@ -82,7 +82,7 @@ node[:kibana][:sites].each do |name, details|
     ))
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[kibana@#{name}]"
   end
 
diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index 86711fb31..cf8405ff8 100644
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -28,7 +28,7 @@ cookbook_file "/var/lib/logstash/lumberjack.crt" do
   source "lumberjack.crt"
   user "root"
   group "logstash"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[logstash]"
 end
 
@@ -36,7 +36,7 @@ file "/var/lib/logstash/lumberjack.key" do
   content keys["lumberjack"].join("\n")
   user "root"
   group "logstash"
-  mode 0640
+  mode 0o640
   notifies :restart, "service[logstash]"
 end
 
@@ -44,12 +44,12 @@ template "/etc/logstash/conf.d/chef.conf" do
   source "logstash.conf.erb"
   user "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :reload, "service[logstash]"
 end
 
 file "/etc/logrotate.d/logstash" do
-  mode 0644
+  mode 0o644
 end
 
 service "logstash" do
@@ -61,7 +61,7 @@ template "/etc/cron.daily/expire-logstash" do
   source "expire.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 forwarders = search(:node, "recipes:logstash\\:\\:forwarder") # ~FC010
diff --git a/cookbooks/logstash/recipes/forwarder.rb b/cookbooks/logstash/recipes/forwarder.rb
index 093912d7c..5dfb42700 100644
--- a/cookbooks/logstash/recipes/forwarder.rb
+++ b/cookbooks/logstash/recipes/forwarder.rb
@@ -25,7 +25,7 @@ cookbook_file "/var/lib/logstash-forwarder/lumberjack.crt" do
   source "lumberjack.crt"
   user "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[logstash-forwarder]"
 end
 
@@ -33,7 +33,7 @@ file "/etc/logstash-forwarder.conf" do
   content JSON.pretty_generate(node[:logstash][:forwarder])
   user "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[logstash-forwarder]"
 end
 
diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 8588c5bea..ac0ba6c8f 100644
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -29,7 +29,7 @@ template "/etc/mailman/mm_cfg.py" do
   source "mm_cfg.py.erb"
   user "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[mailman]"
 end
 
@@ -49,5 +49,5 @@ template "/etc/cron.daily/lists-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
index 33f7ad221..ca0b6706e 100644
--- a/cookbooks/mediawiki/providers/extension.rb
+++ b/cookbooks/mediawiki/providers/extension.rb
@@ -30,10 +30,10 @@ action :create do
       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_mode 0755
+      files_mode 0o755
     end
   else
     extension_repository = new_resource.repository || default_repository
@@ -60,7 +60,7 @@ action :create do
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      mode 0664
+      mode 0o664
       variables new_resource.variables
     end
   else
@@ -71,7 +71,7 @@ action :create do
       content "<?php wfLoadExtension( '#{new_resource.name}' );\n"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      mode 0664
+      mode 0o664
       only_if { ::File.exist?(extension_script) }
     end
   end
diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index e78ca3a25..a3278cc0d 100644
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -76,13 +76,13 @@ action :create do
   directory site_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0775
+    mode 0o775
   end
 
   directory mediawiki_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0775
+    mode 0o775
   end
 
   mediawiki_reference = "REL#{new_resource.version}".tr(".", "_")
@@ -121,19 +121,19 @@ action :create do
   directory "#{mediawiki_directory}/images" do
     owner "www-data"
     group node[:mediawiki][:group]
-    mode 0775
+    mode 0o775
   end
 
   directory "#{mediawiki_directory}/cache" do
     owner "www-data"
     group node[:mediawiki][:group]
-    mode 0775
+    mode 0o775
   end
 
   directory "#{mediawiki_directory}/LocalSettings.d" do
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0775
+    mode 0o775
   end
 
   template "#{mediawiki_directory}/LocalSettings.php" do
@@ -141,7 +141,7 @@ action :create do
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0664
+    mode 0o664
     variables :name => new_resource.name,
               :directory => mediawiki_directory,
               :database_params => new_resource.database_params,
@@ -154,7 +154,7 @@ action :create do
     source "mediawiki.cron.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :name => new_resource.name, :directory => site_directory,
               :user => node[:mediawiki][:user]
   end
@@ -164,7 +164,7 @@ action :create do
     source "mediawiki-backup.cron.erb"
     owner "root"
     group "root"
-    mode 0700
+    mode 0o700
     variables :name => new_resource.name, :directory => site_directory,
               :database_params => new_resource.database_params
   end
@@ -431,7 +431,7 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0644
+    mode 0o644
     backup false
   end
 
@@ -439,7 +439,7 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0644
+    mode 0o644
     backup false
   end
 
@@ -447,7 +447,7 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0644
+    mode 0o644
     backup false
   end
 
@@ -483,7 +483,7 @@ action :update do
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0664
+    mode 0o664
     variables :name => new_resource.name,
               :directory => mediawiki_directory,
               :database_params => new_resource.database_params,
diff --git a/cookbooks/mediawiki/providers/skin.rb b/cookbooks/mediawiki/providers/skin.rb
index bacd49804..f30495d57 100644
--- a/cookbooks/mediawiki/providers/skin.rb
+++ b/cookbooks/mediawiki/providers/skin.rb
@@ -30,10 +30,10 @@ action :create do
       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_mode 0755
+      files_mode 0o755
     end
   else
     skin_repository = new_resource.repository || default_repository
@@ -56,7 +56,7 @@ action :create do
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      mode 0664
+      mode 0o664
       variables new_resource.variables
     end
   else
@@ -67,7 +67,7 @@ action :create do
       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
diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index b9806477c..9b97eacac 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -54,7 +54,7 @@ template "/etc/mediawiki/parsoid/settings.js" do
   source "parsoid-settings.js.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 service "parsoid" do
diff --git a/cookbooks/memcached/recipes/default.rb b/cookbooks/memcached/recipes/default.rb
index 875985733..e96af7e35 100644
--- a/cookbooks/memcached/recipes/default.rb
+++ b/cookbooks/memcached/recipes/default.rb
@@ -28,7 +28,7 @@ template "/etc/memcached.conf" do
   source "memcached.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[memcached]"
 end
 
diff --git a/cookbooks/munin/providers/plugin.rb b/cookbooks/munin/providers/plugin.rb
index bcbb07746..23b9753d8 100644
--- a/cookbooks/munin/providers/plugin.rb
+++ b/cookbooks/munin/providers/plugin.rb
@@ -62,12 +62,11 @@ def plugin_path
 end
 
 def target_path
-  case
-  when ::File.exist?(target)
+  if ::File.exist?(target)
     target
-  when ::File.exist?("/usr/local/share/munin/plugins/#{target}")
+  elsif ::File.exist?("/usr/local/share/munin/plugins/#{target}")
     "/usr/local/share/munin/plugins/#{target}"
-  when ::File.exist?("/usr/share/munin/plugins/#{target}")
+  elsif ::File.exist?("/usr/share/munin/plugins/#{target}")
     "/usr/share/munin/plugins/#{target}"
   end
 end
diff --git a/cookbooks/munin/providers/plugin_conf.rb b/cookbooks/munin/providers/plugin_conf.rb
index 4263165cd..7f63004bd 100644
--- a/cookbooks/munin/providers/plugin_conf.rb
+++ b/cookbooks/munin/providers/plugin_conf.rb
@@ -29,7 +29,7 @@ action :create do
     source new_resource.template
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.variables.merge(:name => new_resource.name)
   end
 end
diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index c01d84130..bcd9dd07e 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -51,7 +51,7 @@ template "/etc/munin/munin-node.conf" do
   source "munin-node.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :servers => servers
   notifies :restart, "service[munin-node]"
 end
@@ -60,10 +60,10 @@ remote_directory "/usr/local/share/munin/plugins" do
   source "plugins"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0755
+  files_mode 0o755
   purge true
 end
 
@@ -71,10 +71,10 @@ remote_directory "/etc/munin/plugin-conf.d" do
   source "plugin-conf.d"
   owner "root"
   group "munin"
-  mode 0750
+  mode 0o750
   files_owner "root"
   files_group "root"
-  files_mode 0644
+  files_mode 0o644
   purge false
   notifies :restart, "service[munin-node]"
 end
diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 90d70d7b1..3f67e522e 100644
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -27,13 +27,13 @@ template "/etc/default/rrdcached" do
   source "rrdcached.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/var/lib/munin/rrdcached" do
   owner "munin"
   group "munin"
-  mode 0755
+  mode 0o755
 end
 
 service "rrdcached" do
@@ -62,7 +62,7 @@ template "/etc/munin/munin.conf" do
   source "munin.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :expiry_time => expiry_time, :clients => clients,
             :frontends => frontends, :backends => backends,
             :tilecaches => tilecaches, :renderers => renderers,
@@ -76,10 +76,10 @@ remote_directory "/srv/munin.openstreetmap.org" do
   source "www"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0644
+  files_mode 0o644
   purge true
 end
 
@@ -91,7 +91,7 @@ template "/etc/cron.daily/munin-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 munin_plugin "munin_stats"
diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index b35eff8f9..bda006579 100644
--- a/cookbooks/mysql/recipes/default.rb
+++ b/cookbooks/mysql/recipes/default.rb
@@ -29,7 +29,7 @@ template "/etc/mysql/conf.d/chef.cnf" do
   source "my.cnf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :reload, "service[mysql]"
 end
 
diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 1774b637b..3adc18d6c 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -50,7 +50,7 @@ template "/etc/network/interfaces" do
   source "interfaces.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 execute "hostname" do
@@ -62,7 +62,7 @@ template "/etc/hostname" do
   source "hostname.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :run, "execute[hostname]"
 end
 
@@ -70,7 +70,7 @@ template "/etc/hosts" do
   source "hosts.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 link "/etc/resolv.conf" do
@@ -84,7 +84,7 @@ template "/etc/resolv.conf" do
   source "resolv.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 node.interfaces(:role => :internal) do |interface|
@@ -135,7 +135,7 @@ template "/etc/default/shorewall" do
   source "shorewall-default.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -143,7 +143,7 @@ template "/etc/shorewall/shorewall.conf" do
   source "shorewall.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -151,7 +151,7 @@ template "/etc/shorewall/zones" do
   source "shorewall-zones.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :type => "ipv4"
   notifies :restart, "service[shorewall]"
 end
@@ -160,7 +160,7 @@ template "/etc/shorewall/interfaces" do
   source "shorewall-interfaces.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -168,7 +168,7 @@ template "/etc/shorewall/hosts" do
   source "shorewall-hosts.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :zones => zones
   notifies :restart, "service[shorewall]"
 end
@@ -177,7 +177,7 @@ template "/etc/shorewall/policy" do
   source "shorewall-policy.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -185,7 +185,7 @@ template "/etc/shorewall/rules" do
   source "shorewall-rules.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :rules => []
   notifies :restart, "service[shorewall]"
 end
@@ -200,7 +200,7 @@ template "/etc/logrotate.d/shorewall" do
   source "logrotate.shorewall.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :name => "shorewall"
 end
 
@@ -231,7 +231,7 @@ if node[:roles].include?("gateway")
     source "shorewall-masq.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall]"
   end
 else
@@ -248,7 +248,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-default.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -256,7 +256,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -264,7 +264,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-zones.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :type => "ipv6"
     notifies :restart, "service[shorewall6]"
   end
@@ -273,7 +273,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -281,7 +281,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :zones => zones
     notifies :restart, "service[shorewall6]"
   end
@@ -290,7 +290,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-policy.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -298,7 +298,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-rules.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :rules => []
     notifies :restart, "service[shorewall6]"
   end
@@ -313,7 +313,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "logrotate.shorewall.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :name => "shorewall6"
   end
 
diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb
index f4c6016bb..f94bb97f1 100644
--- a/cookbooks/nfs/recipes/default.rb
+++ b/cookbooks/nfs/recipes/default.rb
@@ -29,7 +29,7 @@ node[:nfs].each do |mountpoint, details|
   directory mountpoint do
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     recursive true
     not_if { File.exist?(mountpoint) }
   end
diff --git a/cookbooks/nfs/recipes/server.rb b/cookbooks/nfs/recipes/server.rb
index 26159545a..278b08d7f 100644
--- a/cookbooks/nfs/recipes/server.rb
+++ b/cookbooks/nfs/recipes/server.rb
@@ -58,7 +58,7 @@ template "/etc/exports" do
   source "exports.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :exports => exports
   notifies :run, "execute[exportfs]"
 end
diff --git a/cookbooks/nginx/providers/site.rb b/cookbooks/nginx/providers/site.rb
index 64626c503..2417c4f4e 100644
--- a/cookbooks/nginx/providers/site.rb
+++ b/cookbooks/nginx/providers/site.rb
@@ -29,7 +29,7 @@ action :create do
     source new_resource.template
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.variables.merge(:name => new_resource.name, :directory => directory)
   end
 end
diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index bd104f676..307c4c03c 100644
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -25,20 +25,20 @@ template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/var/cache/nginx/fastcgi-cache" do
   owner "www-data"
   group "root"
-  mode 0755
+  mode 0o755
   only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
 
 directory "/var/cache/nginx/proxy-cache" do
   owner "www-data"
   group "root"
-  mode 0755
+  mode 0o755
   only_if { node[:nginx][:cache][:proxy][:enable] }
 end
 
diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index da10a9001..1be84b98e 100644
--- a/cookbooks/nominatim/recipes/base.rb
+++ b/cookbooks/nominatim/recipes/base.rb
@@ -54,7 +54,7 @@ node[:nominatim][:fpm_pools].each do |name, data|
     source "fpm.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables data.merge(:name => name, :port => data[:port])
     notifies :reload, "service[php5-fpm]"
   end
@@ -68,7 +68,7 @@ end
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"
-  mode 0755
+  mode 0o755
   recursive true
 end
 
@@ -76,34 +76,34 @@ file "#{node[:nominatim][:logdir]}/query.log" do
   action :create_if_missing
   owner "www-data"
   group "adm"
-  mode 0664
+  mode 0o664
 end
 
 file "#{node[:nominatim][:logdir]}/update.log" do
   action :create_if_missing
   owner "nominatim"
   group "adm"
-  mode 0664
+  mode 0o664
 end
 
 directory "#{home_directory}/status" do
   owner "nominatim"
   group "postgres"
-  mode 0775
+  mode 0o775
 end
 
 template "/etc/logrotate.d/nominatim" do
   source "logrotate.nominatim.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 package "osmosis"
@@ -140,7 +140,7 @@ template "#{source_directory}/.git/hooks/post-merge" do
   source "update_source.erb"
   owner "nominatim"
   group "nominatim"
-  mode 0755
+  mode 0o755
   variables :source_directory => source_directory
 end
 
@@ -148,7 +148,7 @@ template "#{source_directory}/settings/local.php" do
   source "nominatim.erb"
   owner "nominatim"
   group "nominatim"
-  mode 0664
+  mode 0o664
   variables :postgres_version => database_version
 end
 
@@ -157,21 +157,21 @@ template "#{source_directory}/settings/ip_blocks.conf" do
   source "ipblocks.erb"
   owner "nominatim"
   group "nominatim"
-  mode 0664
+  mode 0o664
 end
 
 file "#{source_directory}/settings/apache_blocks.conf" do
   action :create_if_missing
   owner "nominatim"
   group "nominatim"
-  mode 0664
+  mode 0o664
 end
 
 file "#{source_directory}/settings/ip_blocks.map" do
   action :create_if_missing
   owner "nominatim"
   group "nominatim"
-  mode 0664
+  mode 0o664
 end
 
 cron_action = if node[:nominatim][:enabled]
@@ -193,14 +193,14 @@ template "#{source_directory}/utils/nominatim-update" do
   source "updater.erb"
   user "nominatim"
   group "nominatim"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/init.d/nominatim-update" do
   source "updater.init.erb"
   user "nominatim"
   group "nominatim"
-  mode 0755
+  mode 0o755
   variables :source_directory => source_directory
 end
 
@@ -236,7 +236,7 @@ external_data.each do |fname|
     source "http://www.nominatim.org/data/#{fname}"
     owner "nominatim"
     group "nominatim"
-    mode 0644
+    mode 0o644
   end
 end
 
@@ -247,14 +247,14 @@ additional_scripts.each do |fname|
     source "#{fname}.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
   end
 end
 
 directory File.dirname(node[:nominatim][:flatnode_file]) do
   owner "nominatim"
   group "nominatim"
-  mode 0755
+  mode 0o755
   recursive true
 end
 
diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb
index 22a2a580c..b135022b8 100644
--- a/cookbooks/nominatim/recipes/master.rb
+++ b/cookbooks/nominatim/recipes/master.rb
@@ -60,7 +60,7 @@ end
 directory wal_archives do
   owner "postgres"
   group "postgres"
-  mode 0700
+  mode 0o700
   only_if { node[:postgresql][:settings][:defaults][:archive_mode] == "on" }
 end
 
@@ -68,7 +68,7 @@ template "/usr/local/bin/clean-db-nominatim" do
   source "clean-db-nominatim.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   variables :archive_dir => wal_archives,
             :update_stop_file => "#{home_directory}/status/updates_disabled",
             :streaming_clients => slaves
diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index 96e6c2caf..29f79d693 100644
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -33,7 +33,7 @@ end
 file "/etc/timezone" do
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   content "#{node[:tz]}\n"
   notifies :run, "execute[dpkg-reconfigure-tzdata]", :immediately
 end
@@ -47,7 +47,7 @@ template "/etc/ntp.conf" do
   source "ntp.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[ntp]"
 end
 
diff --git a/cookbooks/ohai/providers/plugin.rb b/cookbooks/ohai/providers/plugin.rb
index 14d1070f5..f51fc79f6 100644
--- a/cookbooks/ohai/providers/plugin.rb
+++ b/cookbooks/ohai/providers/plugin.rb
@@ -32,7 +32,7 @@ action :create do
     source new_resource.template
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :reload, "ohai[#{new_resource.name}]"
   end
 end
diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index 33b703421..2ab68392d 100644
--- a/cookbooks/openssh/recipes/default.rb
+++ b/cookbooks/openssh/recipes/default.rb
@@ -65,14 +65,14 @@ end
 
 template "/etc/ssh/ssh_config" do
   source "ssh_config.erb"
-  mode 0644
+  mode 0o644
   owner "root"
   group "root"
 end
 
 template "/etc/ssh/ssh_known_hosts" do
   source "ssh_known_hosts.erb"
-  mode 0444
+  mode 0o444
   owner "root"
   group "root"
   backup false
diff --git a/cookbooks/openvpn/recipes/default.rb b/cookbooks/openvpn/recipes/default.rb
index 9b96183ee..fcee67dd2 100644
--- a/cookbooks/openvpn/recipes/default.rb
+++ b/cookbooks/openvpn/recipes/default.rb
@@ -55,7 +55,7 @@ node[:openvpn][:tunnels].each do |name, details|
     file "/etc/openvpn/#{name}.key" do
       owner "root"
       group "root"
-      mode 0600
+      mode 0o600
       content peer[:openvpn][:keys][name]
     end
   end
@@ -65,7 +65,7 @@ node[:openvpn][:tunnels].each do |name, details|
       source "tunnel.conf.erb"
       owner "root"
       group "root"
-      mode 0644
+      mode 0o644
       variables :name => name,
                 :address => node[:openvpn][:address],
                 :port => node[:openvpn][:tunnels][name][:port],
diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb
index ddfd65190..d1c1e3f97 100644
--- a/cookbooks/osmosis/recipes/default.rb
+++ b/cookbooks/osmosis/recipes/default.rb
@@ -37,7 +37,7 @@ end
 directory osmosis_directory do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 execute "/var/cache/chef/#{osmosis_package}" do
@@ -53,7 +53,7 @@ remote_file "/var/cache/chef/#{osmosis_package}" do
   source "http://bretth.dev.openstreetmap.org/osmosis-build/#{osmosis_package}"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   backup false
   notifies :run, "execute[/var/cache/chef/#{osmosis_package}]"
 end
diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index fe8306fdc..50ee08a3d 100644
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -58,7 +58,7 @@ node[:osqa][:sites].each do |site|
   directory directory do
     owner site_user
     group site_group
-    mode 0755
+    mode 0o755
   end
 
   execute "osqa-migrate" do
@@ -82,14 +82,14 @@ node[:osqa][:sites].each do |site|
   directory "#{directory}/upfiles" do
     user site_user
     group site_group
-    mode 0755
+    mode 0o755
   end
 
   template "#{directory}/osqa/osqa.wsgi" do
     source "osqa.wsgi.erb"
     owner site_user
     group site_group
-    mode 0644
+    mode 0o644
     variables :directory => directory
     notifies :reload, "service[apache2]"
   end
@@ -111,7 +111,7 @@ node[:osqa][:sites].each do |site|
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group
-    mode 0644
+    mode 0o644
     content settings
     notifies :reload, "service[apache2]"
   end
@@ -120,7 +120,7 @@ node[:osqa][:sites].each do |site|
     source "backup.cron.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     variables :name => backup_name, :directory => directory, :user => site_user, :database => database_name
   end
 end
diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 0b810f428..e57609da7 100644
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -75,7 +75,7 @@ end
 file "/opt/otrs-#{version}/Kernel/Config.pm" do
   owner user
   group "www-data"
-  mode 0664
+  mode 0o664
   content config
 end
 
@@ -86,7 +86,7 @@ end
 file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm" do
   owner user
   group "www-data"
-  mode 0664
+  mode 0o664
   content generic_agent
 end
 
@@ -135,7 +135,7 @@ Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
   file name do
     owner "otrs"
     group "www-data"
-    mode 0664
+    mode 0o664
     content IO.read(distname)
     notifies :run, "execute[/opt/otrs/bin/Cron.sh]"
   end
@@ -149,12 +149,12 @@ template "/etc/sudoers.d/otrs" do
   source "sudoers.erb"
   owner "root"
   group "root"
-  mode 0440
+  mode 0o440
 end
 
 template "/etc/cron.daily/otrs-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
diff --git a/cookbooks/owl/recipes/default.rb b/cookbooks/owl/recipes/default.rb
index f71623c6e..c65e2c74a 100644
--- a/cookbooks/owl/recipes/default.rb
+++ b/cookbooks/owl/recipes/default.rb
@@ -82,7 +82,7 @@ end
 directory "/srv/owl.openstreetmap.org" do
   owner "owl"
   group "owl"
-  mode 02775
+  mode 0o2775
 end
 
 file "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp/restart.txt" do
@@ -121,7 +121,7 @@ template "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/config/datab
   source "database.yml.erb"
   owner "owl"
   group "owl"
-  mode 0664
+  mode 0o664
   notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]"
   only_if { node[:postgresql][:clusters][:"9.1/main"] }
 end
diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 229281c05..89292e048 100644
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -31,7 +31,7 @@ template "/usr/local/bin/passenger-ruby" do
   source "ruby.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   notifies :reload, "service[apache2]"
 end
 
diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 99798fd05..28bf48273 100644
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -40,27 +40,27 @@ remote_directory "/store/planet" do
   mode "0755"
   files_owner "root"
   files_group "root"
-  files_mode 0644
+  files_mode 0o644
 end
 
 remote_directory "/store/planet" do
   source "cgi"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0755
+  files_mode 0o755
 end
 
 remote_directory node[:planet][:dump][:xml_history_directory] do
   source "history_cgi"
   owner "www-data"
   group "planet"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0755
+  files_mode 0o755
 end
 
 [:xml_directory, :xml_history_directory,
@@ -68,21 +68,21 @@ end
   directory node[:planet][:dump][dir] do
     owner "www-data"
     group "planet"
-    mode 0775
+    mode 0o775
   end
 end
 
 directory "/store/planet/notes" do
   owner "www-data"
   group "planet"
-  mode 0775
+  mode 0o775
 end
 
 template "/usr/local/bin/apache-latest-planet-filename" do
   source "apache-latest-planet-filename.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 apache_module "cgid"
@@ -97,7 +97,7 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 munin_plugin "planet_age"
diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 452e07d47..ea32ef5af 100644
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -49,7 +49,7 @@ package "php-curl"
 directory "/opt/planet-dump-ng" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 git "/opt/planet-dump-ng" do
@@ -90,7 +90,7 @@ end
 directory "/store/planetdump" do
   owner "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
 end
 
 ["planetdump", "planet-mirror-redirect-update", "apache-latest-planet-filename"].each do |program|
@@ -98,7 +98,7 @@ end
     source "#{program}.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
   end
 end
 
@@ -106,5 +106,5 @@ template "/etc/cron.d/planet-dump-mirror" do
   source "planet-dump-mirror-cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/planet/recipes/notes.rb b/cookbooks/planet/recipes/notes.rb
index 728261cc9..f4a1dc969 100644
--- a/cookbooks/planet/recipes/notes.rb
+++ b/cookbooks/planet/recipes/notes.rb
@@ -27,7 +27,7 @@ package "python-lxml"
 directory "/opt/planet-notes-dump" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 git "/opt/planet-notes-dump" do
@@ -41,7 +41,7 @@ template "/usr/local/bin/planet-notes-dump" do
   source "planet-notes-dump.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   variables :password => db_passwords["planetdump"]
 end
 
@@ -49,5 +49,5 @@ template "/etc/cron.d/planet-notes-dump" do
   source "planet-notes-dump.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index adb9bb7e1..b20cf7c65 100644
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -34,64 +34,64 @@ remote_directory "/usr/local/bin" do
   source "replication-bin"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0755
+  files_mode 0o755
 end
 
 template "/usr/local/bin/users-agreed" do
   source "users-agreed.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 remote_directory "/store/planet/replication" do
   source "replication-cgi"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0755
+  files_mode 0o755
 end
 
 directory "/store/planet/replication/changesets" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/store/planet/replication/day" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/store/planet/replication/hour" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/store/planet/replication/minute" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/etc/replication" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/replication/auth.conf" do
   source "replication.auth.erb"
   user "root"
   group "planet"
-  mode 0640
+  mode 0o640
   variables :password => db_passwords["planetdiff"]
 end
 
@@ -99,7 +99,7 @@ template "/etc/replication/changesets.conf" do
   source "changesets.conf.erb"
   user "root"
   group "planet"
-  mode 0640
+  mode 0o640
   variables :password => db_passwords["planetdiff"]
 end
 
@@ -107,27 +107,27 @@ template "/etc/replication/users-agreed.conf" do
   source "users-agreed.conf.erb"
   user "planet"
   group "planet"
-  mode 0600
+  mode 0o600
   variables :password => db_passwords["planetdiff"]
 end
 
 directory "/var/lib/replication" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/lib/replication/hour" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 template "/var/lib/replication/hour/configuration.txt" do
   source "replication.config.erb"
   owner "planet"
   group "planet"
-  mode 0644
+  mode 0o644
   variables :base => "minute", :interval => 3600
 end
 
@@ -138,14 +138,14 @@ end
 directory "/var/lib/replication/day" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 template "/var/lib/replication/day/configuration.txt" do
   source "replication.config.erb"
   owner "planet"
   group "planet"
-  mode 0644
+  mode 0o644
   variables :base => "hour", :interval => 86400
 end
 
@@ -158,7 +158,7 @@ if node[:planet][:replication] == "enabled"
     source "replication.cron.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
   end
 else
   file "/etc/cron.d/replication" do
@@ -169,13 +169,13 @@ end
 directory "/var/lib/replication/streaming" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/log/replication" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 ["streaming-replicator", "streaming-server"].each do |name|
@@ -183,7 +183,7 @@ end
     source "streaming.init.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     variables :service => name
   end
 
diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index d94b29a0e..c71416350 100644
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -32,7 +32,7 @@ node[:postgresql][:versions].each do |version|
     source "postgresql.conf.erb"
     owner "postgres"
     group "postgres"
-    mode 0644
+    mode 0o644
     variables :version => version, :defaults => defaults, :settings => settings
     notifies :reload, "service[postgresql]"
   end
@@ -41,7 +41,7 @@ node[:postgresql][:versions].each do |version|
     source "pg_hba.conf.erb"
     owner "postgres"
     group "postgres"
-    mode 0640
+    mode 0o640
     variables :early_rules => settings[:early_authentication_rules] || defaults[:early_authentication_rules],
               :late_rules => settings[:late_authentication_rules] || defaults[:late_authentication_rules]
     notifies :reload, "service[postgresql]"
@@ -51,7 +51,7 @@ node[:postgresql][:versions].each do |version|
     source "pg_ident.conf.erb"
     owner "postgres"
     group "postgres"
-    mode 0640
+    mode 0o640
     variables :maps => settings[:user_name_maps] || defaults[:user_name_maps]
     notifies :reload, "service[postgresql]"
   end
@@ -78,7 +78,7 @@ node[:postgresql][:versions].each do |version|
       source "recovery.conf.erb"
       owner "postgres"
       group "postgres"
-      mode 0640
+      mode 0o640
       variables :standby_mode => standby_mode,
                 :primary_conninfo => primary_conninfo,
                 :restore_command => restore_command,
diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb
index 18eb23082..deaf9a0d2 100644
--- a/cookbooks/rsyncd/recipes/default.rb
+++ b/cookbooks/rsyncd/recipes/default.rb
@@ -47,7 +47,7 @@ template "/etc/default/rsync" do
   source "rsync.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[rsync]"
 end
 
@@ -55,7 +55,7 @@ template "/etc/rsyncd.conf" do
   source "rsyncd.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :hosts_allow => hosts_allow, :hosts_deny => hosts_deny
 end
 
diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index e5fd33d22..e68620f7b 100644
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -38,7 +38,7 @@ roles = { :rows => search(:role, "*:*") }
 
 file "/srv/hardware.openstreetmap.org/_data/nodes.json" do
   content nodes.to_json
-  mode 0644
+  mode 0o644
   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
@@ -46,14 +46,14 @@ end
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json
-  mode 0644
+  mode 0o644
   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
 end
 
 directory "/srv/hardware.openstreetmap.org/_site" do
-  mode 0755
+  mode 0o755
   owner "nobody"
   group "nogroup"
 end
diff --git a/cookbooks/snmpd/recipes/default.rb b/cookbooks/snmpd/recipes/default.rb
index ecc8170cd..38c0b3581 100644
--- a/cookbooks/snmpd/recipes/default.rb
+++ b/cookbooks/snmpd/recipes/default.rb
@@ -32,7 +32,7 @@ template "/etc/snmp/snmpd.conf" do
   source "snmpd.conf.erb"
   owner "root"
   group "root"
-  mode 0600
+  mode 0o600
   variables :communities => communities
   notifies :restart, "service[snmpd]"
 end
diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index dd1e19eb1..28e3a1cd5 100644
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -27,14 +27,14 @@ end
 directory "/var/spool/spamassassin" do
   owner "debian-spamd"
   group "debian-spamd"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/default/spamassassin" do
   source "spamassassin.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[spamassassin]"
 end
 
@@ -52,7 +52,7 @@ template "/etc/spamassassin/local.cf" do
   source "local.cf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :trusted_networks => trusted_networks.sort
   notifies :restart, "service[spamassassin]"
 end
diff --git a/cookbooks/squid/providers/fragment.rb b/cookbooks/squid/providers/fragment.rb
index 022dd120b..c61b022d5 100644
--- a/cookbooks/squid/providers/fragment.rb
+++ b/cookbooks/squid/providers/fragment.rb
@@ -28,7 +28,7 @@ action :create do
     source new_resource.template
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.variables
   end
 end
diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index c774bb5fb..e665d57e3 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -24,20 +24,20 @@ template "/etc/squid/squid.conf" do
   source "squid.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/default/squid" do
   source "squid.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 if node[:lsb][:release].to_f >= 15.10
diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb
index f737fe1a6..33c9bcb14 100644
--- a/cookbooks/ssl/recipes/default.rb
+++ b/cookbooks/ssl/recipes/default.rb
@@ -26,7 +26,7 @@ package "ssl-cert"
   cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
     owner "root"
     group "root"
-    mode 0444
+    mode 0o444
     backup false
   end
 end
@@ -36,14 +36,14 @@ end
     cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
       owner "root"
       group "root"
-      mode 0444
+      mode 0o444
       backup false
     end
 
     file "/etc/ssl/private/#{certificate}.key" do
       owner "root"
       group "ssl-cert"
-      mode 0440
+      mode 0o440
       content keys[certificate].join("\n")
       backup false
     end
diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 55e40e217..0dc6e8e76 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -37,7 +37,7 @@ end
 directory "/srv/2007.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 wordpress_site "2007.stateofthemap.org" do
@@ -68,7 +68,7 @@ end
 directory "/srv/2008.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 wordpress_site "2008.stateofthemap.org" do
@@ -94,7 +94,7 @@ end
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2009.stateofthemap.org" do
@@ -130,7 +130,7 @@ end
 directory "/srv/2010.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2010.stateofthemap.org" do
@@ -169,7 +169,7 @@ end
 directory "/srv/2011.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2011.stateofthemap.org" do
@@ -208,7 +208,7 @@ end
 directory "/srv/2012.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2012.stateofthemap.org" do
@@ -251,7 +251,7 @@ end
 directory "/srv/2016.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 wordpress_site "2016.stateofthemap.org" do
@@ -286,6 +286,6 @@ template "/etc/cron.daily/sotm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end
diff --git a/cookbooks/stats/recipes/default.rb b/cookbooks/stats/recipes/default.rb
index aec51357c..54d394f52 100644
--- a/cookbooks/stats/recipes/default.rb
+++ b/cookbooks/stats/recipes/default.rb
@@ -27,7 +27,7 @@ node[:stats][:sites].each do |site|
     source "awstats.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :site => site
   end
 end
@@ -36,41 +36,41 @@ template "/etc/cron.d/awstats" do
   source "awstats.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :sites => node[:stats][:sites]
 end
 
 cookbook_file "/usr/local/bin/repack-archived-logs" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.d/repack-archived-logs" do
   source "repack.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/srv/stats.openstreetmap.org" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/srv/stats.openstreetmap.org/index.html" do
   source "index.html.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :sites => node[:stats][:sites]
 end
 
 cookbook_file "/srv/stats.openstreetmap.org/robots.txt" do
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 apache_site "stats.openstreetmap.org" do
diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 10de0520d..96941ed73 100644
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -28,10 +28,10 @@ remote_directory "#{repository_directory}/hooks" do
   source "hooks"
   owner "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
   files_owner "www-data"
   files_group "www-data"
-  files_mode 0755
+  files_mode 0o755
   purge false
 end
 
@@ -61,5 +61,5 @@ template "/etc/cron.daily/svn-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
diff --git a/cookbooks/supybot/recipes/default.rb b/cookbooks/supybot/recipes/default.rb
index 24d860f14..7f9953526 100644
--- a/cookbooks/supybot/recipes/default.rb
+++ b/cookbooks/supybot/recipes/default.rb
@@ -26,14 +26,14 @@ package "python-git"
 directory "/etc/supybot" do
   owner "supybot"
   group "supybot"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/supybot/supybot.conf" do
   source "supybot.conf.erb"
   owner "supybot"
   group "supybot"
-  mode 0644
+  mode 0o644
   variables :passwords => passwords
 end
 
@@ -41,78 +41,78 @@ template "/etc/supybot/channels.conf" do
   source "channels.conf.erb"
   owner "supybot"
   group "supybot"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/supybot/git.conf" do
   source "git.conf.erb"
   owner "supybot"
   group "supybot"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/supybot/ignores.conf" do
   source "ignores.conf.erb"
   owner "supybot"
   group "supybot"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/supybot/userdata.conf" do
   source "userdata.conf.erb"
   owner "supybot"
   group "supybot"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/supybot/users.conf" do
   source "users.conf.erb"
   owner "supybot"
   group "supybot"
-  mode 0644
+  mode 0o644
   variables :passwords => users
 end
 
 directory "/var/lib/supybot" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/lib/supybot/data" do
   owner "supybot"
   group "supybot"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/lib/supybot/backup" do
   owner "supybot"
   group "supybot"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/lib/supybot/git" do
   owner "supybot"
   group "supybot"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/log/supybot" do
   owner "supybot"
   group "supybot"
-  mode 0755
+  mode 0o755
 end
 
 directory "/usr/local/lib/supybot" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 directory "/usr/local/lib/supybot/plugins" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 git "/usr/local/lib/supybot/plugins/Git" do
@@ -127,7 +127,7 @@ template "/etc/init.d/supybot" do
   source "supybot.init.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 service "supybot" do
diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 5b2703fee..bc751a962 100644
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -75,6 +75,6 @@ template "/etc/cron.daily/switch2osm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end
diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index 562504835..930541945 100644
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -24,7 +24,7 @@ end
 directory "/etc/sysctl.d" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 execute "sysctl" do
@@ -36,7 +36,7 @@ template "/etc/sysctl.d/60-chef.conf" do
   source "chef.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :run, "execute[sysctl]"
 end
 
diff --git a/cookbooks/sysfs/recipes/default.rb b/cookbooks/sysfs/recipes/default.rb
index 0e59c1e1e..1b9fc7004 100644
--- a/cookbooks/sysfs/recipes/default.rb
+++ b/cookbooks/sysfs/recipes/default.rb
@@ -28,7 +28,7 @@ template "/etc/sysfs.conf" do
   source "sysfs.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[sysfsutils]"
 end
 
diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 39abc608e..5488cc2bf 100644
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -46,7 +46,7 @@ action :create do
     source "service.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.to_hash
   end
 
diff --git a/cookbooks/systemd/resources/tmpfile.rb b/cookbooks/systemd/resources/tmpfile.rb
index 8bf64ae09..413877013 100644
--- a/cookbooks/systemd/resources/tmpfile.rb
+++ b/cookbooks/systemd/resources/tmpfile.rb
@@ -33,7 +33,7 @@ action :create do
     source "tmpfile.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.to_hash
   end
 
diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index c1c428290..45bf0da27 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -58,13 +58,13 @@ template "/etc/cron.d/taginfo" do
   source "cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/var/log/taginfo" do
   owner "taginfo"
   group "taginfo"
-  mode 0755
+  mode 0o755
 end
 
 file "/etc/logrotate.d/taginfo" do
@@ -75,7 +75,7 @@ template "/etc/sudoers.d/taginfo" do
   source "sudoers.erb"
   owner "root"
   group "root"
-  mode 0440
+  mode 0o440
 end
 
 node[:taginfo][:sites].each do |site|
@@ -89,13 +89,13 @@ node[:taginfo][:sites].each do |site|
   directory "/var/log/taginfo/#{name}" do
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
   end
 
   directory directory do
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
   end
 
   git "#{directory}/libosmium" do
@@ -148,7 +148,7 @@ node[:taginfo][:sites].each do |site|
   file "#{directory}/taginfo-config.json" do
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
     content settings
     notifies :restart, "service[apache2]"
   end
@@ -185,7 +185,7 @@ node[:taginfo][:sites].each do |site|
     directory "#{directory}/#{dir}" do
       owner "taginfo"
       group "taginfo"
-      mode 0755
+      mode 0o755
     end
   end
 
@@ -194,27 +194,27 @@ node[:taginfo][:sites].each do |site|
     source "http://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
   end
 
   template "#{directory}/planet/replication/configuration.txt" do
     source "configuration.txt.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
   end
 
   file "#{directory}/planet/replication/download.lock" do
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
   end
 
   template "#{directory}/bin/update-planet" do
     source "update-planet.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
     variables :directory => directory
   end
 
@@ -222,7 +222,7 @@ node[:taginfo][:sites].each do |site|
     source "update-taginfo.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
     variables :directory => directory
   end
 
@@ -230,7 +230,7 @@ node[:taginfo][:sites].each do |site|
     source "update.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
     variables :name => name, :directory => directory
   end
 
diff --git a/cookbooks/thinkup/recipes/default.rb b/cookbooks/thinkup/recipes/default.rb
index c06feb7f9..ce663bee9 100644
--- a/cookbooks/thinkup/recipes/default.rb
+++ b/cookbooks/thinkup/recipes/default.rb
@@ -90,7 +90,7 @@ end
 file "/srv/thinkup.openstreetmap.org/webapp/config.inc.php" do
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   content thinkup_config
   notifies :reload, "service[apache2]"
 end
@@ -108,7 +108,7 @@ end
 file "/srv/thinkup.openstreetmap.org/extras/cron/config" do
   owner "root"
   group "thinkup"
-  mode 0640
+  mode 0o640
   content thinkup_cron
 end
 
@@ -123,6 +123,6 @@ template "/etc/cron.daily/thinkup-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end
diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 5c923c8b7..583ea307f 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -51,13 +51,13 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 package "renderd"
@@ -70,14 +70,14 @@ end
 directory "/srv/tile.openstreetmap.org/tiles" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end
@@ -86,17 +86,17 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   source "html"
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
   files_owner "tile"
   files_group "tile"
-  files_mode 0644
+  files_mode 0o644
 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"
-  mode 0644
+  mode 0o644
 end
 
 package "python-cairo"
@@ -115,14 +115,14 @@ package "ttf-kannada-fonts"
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
   variables :blocks => blocks
 end
 
@@ -130,20 +130,20 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
   source "debug.erb"
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.hourly/export" do
   source "export.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 package "mapnik-utils"
@@ -156,7 +156,7 @@ node[:tile][:data].each_value do |data|
   directory directory do
     owner "tile"
     group "tile"
-    mode 0755
+    mode 0o755
   end
 
   if file =~ /\.tgz$/
@@ -208,7 +208,7 @@ node[:tile][:data].each_value do |data|
     source url
     owner "tile"
     group "tile"
-    mode 0644
+    mode 0o644
     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"
@@ -221,7 +221,7 @@ nodejs_package "millstone"
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 node[:tile][:styles].each do |name, details|
@@ -232,7 +232,7 @@ node[:tile][:styles].each do |name, details|
     source "update-lowzoom.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     variables :style => name
   end
 
@@ -240,7 +240,7 @@ node[:tile][:styles].each do |name, details|
     source "update-lowzoom.init.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     variables :style => name
   end
 
@@ -252,21 +252,21 @@ node[:tile][:styles].each do |name, details|
   directory tile_directory do
     owner "tile"
     group "tile"
-    mode 0755
+    mode 0o755
   end
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do
       owner "www-data"
       group "www-data"
-      mode 0755
+      mode 0o755
     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do
         owner "www-data"
         group "www-data"
-        mode 0755
+        mode 0o755
       end
 
       link "#{tile_directory}/#{zoom}" do
@@ -281,7 +281,7 @@ node[:tile][:styles].each do |name, details|
     action :create_if_missing
     owner "tile"
     group "tile"
-    mode 0444
+    mode 0o444
   end
 
   git style_directory do
@@ -366,13 +366,13 @@ end
 file node[:tile][:node_file] do
   owner "tile"
   group "www-data"
-  mode 0640
+  mode 0o640
 end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 package "osm2pgsql"
@@ -391,51 +391,51 @@ remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0644
+  files_mode 0o644
 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/sudoers.d/tile" do
   source "sudoers.erb"
   owner "root"
   group "root"
-  mode 0440
+  mode 0o440
 end
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 template "/var/lib/replicate/configuration.txt" do
   source "replicate.configuration.erb"
   owner "tile"
   group "tile"
-  mode 0644
+  mode 0o644
 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/init.d/replicate" do
   source "replicate.init.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 service "replicate" do
@@ -449,28 +449,28 @@ template "/etc/logrotate.d/replicate" do
   source "replicate.logrotate.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.d/render-lowzoom" do
   source "render-lowzoom.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/rsyslog.d/20-renderd.conf" do
   source "renderd.rsyslog.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[rsyslog]"
 end
 
@@ -478,7 +478,7 @@ template "/etc/logrotate.d/renderd" do
   source "renderd.logrotate.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 package "liblockfile-simple-perl"
@@ -488,7 +488,7 @@ template "/usr/local/bin/cleanup-tiles" do
   source "cleanup-tiles.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 tile_directories = node[:tile][:styles].collect do |_, style|
@@ -499,7 +499,7 @@ template "/etc/cron.d/cleanup-tiles" do
   source "cleanup-tiles.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :directories => tile_directories
 end
 
diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 86c7d0250..625783b66 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -77,7 +77,7 @@ template "/etc/logrotate.d/squid" do
   source "logrotate.squid.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 nginx_site "default" do
@@ -105,7 +105,7 @@ template "/etc/logrotate.d/nginx" do
   source "logrotate.nginx.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 tilerenders.each do |render|
diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb
index 9ab433195..6fef30343 100644
--- a/cookbooks/tilelog/recipes/default.rb
+++ b/cookbooks/tilelog/recipes/default.rb
@@ -72,7 +72,7 @@ template "/usr/local/bin/tilelog" do
   source "tilelog.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   variables :analyze_bin => "#{tilelog_source_directory}/openstreetmap-tile-analyze",
             :input_dir => tilelog_input_directory,
             :output_dir => tilelog_output_directory
@@ -82,7 +82,7 @@ template "/etc/cron.d/tilelog" do
   source "tilelog.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 # resources related to the output of the analysis and where it
@@ -91,5 +91,5 @@ directory tilelog_output_directory do
   action :create
   user "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
 end
diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index d61feab0e..6d42cb3a7 100644
--- a/cookbooks/trac/recipes/default.rb
+++ b/cookbooks/trac/recipes/default.rb
@@ -30,7 +30,7 @@ template "/var/lib/trac/conf/trac.ini" do
   source "trac.ini.erb"
   owner "trac"
   group "www-data"
-  mode 0644
+  mode 0o644
   variables :name => site_name
 end
 
@@ -38,10 +38,10 @@ remote_directory "/var/lib/trac/htdocs" do
   source "htdocs"
   owner "trac"
   group "trac"
-  mode 0755
+  mode 0o755
   files_owner "trac"
   files_group "trac"
-  files_mode 0644
+  files_mode 0o644
   purge true
 end
 
@@ -49,10 +49,10 @@ remote_directory "/var/lib/trac/templates" do
   source "templates"
   owner "trac"
   group "trac"
-  mode 0755
+  mode 0o755
   files_owner "trac"
   files_group "trac"
-  files_mode 0644
+  files_mode 0o644
   purge true
 end
 
@@ -66,7 +66,7 @@ end
 cookbook_file "/usr/local/bin/trac-authenticate" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 apache_module "wsgi"
@@ -81,12 +81,12 @@ template "/etc/sudoers.d/trac" do
   source "sudoers.erb"
   owner "root"
   group "root"
-  mode 0440
+  mode 0o440
 end
 
 template "/etc/cron.daily/trac-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index 79a9cc836..955927a40 100644
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -72,7 +72,7 @@ define :rails_port, :action => [:create, :enable] do
   directory rails_directory do
     owner rails_user
     group rails_group
-    mode 02775
+    mode 0o2775
   end
 
   git rails_directory do
@@ -102,7 +102,7 @@ define :rails_port, :action => [:create, :enable] do
     source "database.yml.erb"
     owner rails_user
     group rails_group
-    mode 0664
+    mode 0o664
     variables database_params
     notifies :run, "execute[#{rails_directory}]"
   end
@@ -201,7 +201,7 @@ define :rails_port, :action => [:create, :enable] do
   file "#{rails_directory}/config/application.yml" do
     owner rails_user
     group rails_group
-    mode 0664
+    mode 0o664
     content application_yml
     notifies :run, "execute[#{rails_directory}/public/assets]"
   end
@@ -210,7 +210,7 @@ define :rails_port, :action => [:create, :enable] do
     file "#{rails_directory}/config/piwik.yml" do
       owner rails_user
       group rails_group
-      mode 0664
+      mode 0o664
       content YAML.dump(params[:piwik_configuration])
       notifies :run, "execute[#{rails_directory}/public/assets]"
     end
@@ -292,7 +292,7 @@ define :rails_port, :action => [:create, :enable] do
     source "rails.cron.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     variables :directory => rails_directory
   end
 end
diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index 374c970b4..d5b30ba66 100644
--- a/cookbooks/web/recipes/base.rb
+++ b/cookbooks/web/recipes/base.rb
@@ -26,24 +26,24 @@ include_recipe "nfs"
 
 directory node[:web][:base_directory] do
   group "rails"
-  mode 02775
+  mode 0o2775
 end
 
 directory node[:web][:pid_directory] do
   owner "rails"
   group "rails"
-  mode 0775
+  mode 0o775
 end
 
 directory node[:web][:log_directory] do
   owner "rails"
   group "rails"
-  mode 0775
+  mode 0o775
 end
 
 template "/etc/logrotate.d/web" do
   source "logrotate.web.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 067b9e3f5..2adb9d099 100644
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -112,7 +112,7 @@ end
 file "/etc/init.d/cgimap" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   content cgimap_init
 end
 
diff --git a/cookbooks/web/recipes/cleanup.rb b/cookbooks/web/recipes/cleanup.rb
index 2b1039020..eff819ae0 100644
--- a/cookbooks/web/recipes/cleanup.rb
+++ b/cookbooks/web/recipes/cleanup.rb
@@ -26,6 +26,6 @@ template "/etc/cron.daily/web-cleanup" do
   source "cleanup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   variables :ruby => ruby, :directory => rails_directory
 end
diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index ab6742b01..636cb56d7 100644
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -45,5 +45,5 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/web/recipes/gpx.rb b/cookbooks/web/recipes/gpx.rb
index 51eea1ed4..7806530d9 100644
--- a/cookbooks/web/recipes/gpx.rb
+++ b/cookbooks/web/recipes/gpx.rb
@@ -57,7 +57,7 @@ template "/etc/init.d/gpx-import" do
   source "init.gpx.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   variables :gpx_directory => gpx_directory,
             :pid_directory => pid_directory,
             :log_directory => log_directory,
diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 5b42c978c..6b23cf30a 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -35,7 +35,7 @@ template "/etc/cron.hourly/passenger" do
   source "passenger.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
@@ -85,7 +85,7 @@ template "/usr/local/bin/cleanup-rails-assets" do
   source "cleanup-assets.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 gem_package "apachelogregex"
@@ -95,14 +95,14 @@ template "/usr/local/bin/api-statistics" do
   source "api-statistics.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/init.d/api-statistics" do
   source "api-statistics.init.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 service "api-statistics" do
diff --git a/cookbooks/web/recipes/statistics.rb b/cookbooks/web/recipes/statistics.rb
index 1be580c1e..239d46e08 100644
--- a/cookbooks/web/recipes/statistics.rb
+++ b/cookbooks/web/recipes/statistics.rb
@@ -26,7 +26,7 @@ template "/usr/local/bin/statistics" do
   source "statistics.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   variables :ruby => ruby, :directory => rails_directory
 end
 
@@ -34,5 +34,5 @@ template "/etc/cron.d/statistics" do
   source "statistics.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index f740d9c06..25911eb3e 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -59,20 +59,20 @@ end
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
-  mode 0644
+  mode 0o644
 end
 
 template "/srv/wiki.openstreetmap.org/robots.txt" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
-  mode 0644
+  mode 0o644
   source "robots.txt.erb"
 end
 
 cookbook_file "/srv/wiki.openstreetmap.org/favicon.ico" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
-  mode 0644
+  mode 0o644
 end
 
 directory "/srv/dump.wiki.openstreetmap.org" do
@@ -90,6 +90,6 @@ end
 template "/etc/cron.d/wiki-osm-org-dump" do
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   source "cron_wiki_dump.erb"
 end
diff --git a/cookbooks/wordpress/providers/plugin.rb b/cookbooks/wordpress/providers/plugin.rb
index ca490847e..68c17275b 100644
--- a/cookbooks/wordpress/providers/plugin.rb
+++ b/cookbooks/wordpress/providers/plugin.rb
@@ -30,10 +30,10 @@ action :create do
       source new_resource.source
       owner node[:wordpress][:user]
       group node[:wordpress][:group]
-      mode 0755
+      mode 0o755
       files_owner node[:wordpress][:user]
       files_group node[:wordpress][:group]
-      files_mode 0755
+      files_mode 0o755
     end
   else
     plugin_repository = new_resource.repository || default_repository
diff --git a/cookbooks/wordpress/providers/site.rb b/cookbooks/wordpress/providers/site.rb
index d5d6eb3c3..a664b0ea8 100644
--- a/cookbooks/wordpress/providers/site.rb
+++ b/cookbooks/wordpress/providers/site.rb
@@ -54,7 +54,7 @@ action :create do
   directory site_directory do
     owner node[:wordpress][:user]
     group node[:wordpress][:group]
-    mode 0755
+    mode 0o755
   end
 
   subversion site_directory do
@@ -98,14 +98,14 @@ action :create do
   file "#{site_directory}/wp-config.php" do
     owner node[:wordpress][:user]
     group node[:wordpress][:group]
-    mode 0644
+    mode 0o644
     content wp_config
   end
 
   directory "#{site_directory}/wp-content/uploads" do
     owner "www-data"
     group "www-data"
-    mode 0755
+    mode 0o755
   end
 
   file "#{site_directory}/sitemap.xml" do
@@ -120,7 +120,7 @@ action :create do
     cookbook "wordpress"
     owner node[:wordpress][:user]
     group node[:wordpress][:group]
-    mode 0644
+    mode 0o644
     backup false
   end
 
diff --git a/cookbooks/wordpress/providers/theme.rb b/cookbooks/wordpress/providers/theme.rb
index 018492bc1..b5427ea1a 100644
--- a/cookbooks/wordpress/providers/theme.rb
+++ b/cookbooks/wordpress/providers/theme.rb
@@ -30,10 +30,10 @@ action :create do
       source new_resource.source
       owner node[:wordpress][:user]
       group node[:wordpress][:group]
-      mode 0755
+      mode 0o755
       files_owner node[:wordpress][:user]
       files_group node[:wordpress][:group]
-      files_mode 0644
+      files_mode 0o644
     end
   else
     theme_repository = new_resource.repository || default_repository