Use string for file modes in remote_directory resources

diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb
index 586d59004a2e463ef94a7ad9fd17394e2ded1326..e1023682a094cf55498cea191f608c347644ebe0 100644 (file)
--- a/cookbooks/accounts/recipes/default.rb
+++ b/cookbooks/accounts/recipes/default.rb
@@ -67,7 +67,7 @@ search(:accounts, "*:*").each do |account|
       mode "755"
       files_owner name.to_s
       files_group name.to_s
       mode "755"
       files_owner name.to_s
       files_group name.to_s

-      files_mode 0o644
+      files_mode "644"

       only_if do
         cookbook = run_context.cookbook_collection[cookbook_name]
         files = cookbook.relative_filenames_in_preferred_directory(node, :files, name.to_s)
       only_if do
         cookbook = run_context.cookbook_collection[cookbook_name]
         files = cookbook.relative_filenames_in_preferred_directory(node, :files, name.to_s)

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 7fd25945c49c44c388e2dfdad91124f317c73024..be4e96c68342f5502e89a1ebe9e7f2ca876c1772 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -476,7 +476,7 @@ remote_directory "/srv/ooc.openstreetmap.org/html" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 ssl_certificate "ooc.openstreetmap.org" do
 end
 
 ssl_certificate "ooc.openstreetmap.org" do

diff --git a/cookbooks/dmca/recipes/default.rb b/cookbooks/dmca/recipes/default.rb
index 625f702f1284d5387cdc89b88ec4ddd80b936515..30ab6d9ab31aeb97e5f6065fa86c6921616d530e 100644 (file)
--- a/cookbooks/dmca/recipes/default.rb
+++ b/cookbooks/dmca/recipes/default.rb
@@ -33,7 +33,7 @@ remote_directory "/srv/dmca.openstreetmap.org/html" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 ssl_certificate "dmca.openstreetmap.org" do
 end
 
 ssl_certificate "dmca.openstreetmap.org" do

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 6bb3865f0dccd4f2301c1af18e325f0a25c6ddec..ba6355b04cd85576c2dda3169463f4418fd67537 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -60,7 +60,7 @@ remote_directory "/srv/dns.openstreetmap.org/html" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 zones = []
 end
 
 zones = []

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 2e8e0f6420af0b2d1106577634036156d9ae6ee1..6234aa96412ab3034b1f5cbf3b0a6540efaef7a4 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -191,7 +191,7 @@ remote_directory "/etc/exim4/noreply" do
   mode "755"
   files_owner "root"
   files_group "Debian-exim"
   mode "755"
   files_owner "root"
   files_group "Debian-exim"

-  files_mode 0o755
+  files_mode "755"

   purge true
 end
 
   purge true
 end
 

diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb
index 5546b3431bbf4c1e2c35438155b55d8a9be54796..21a515034978ca31bf19a034e3a18b94e9ff8f1e 100644 (file)
--- a/cookbooks/gps-tile/recipes/default.rb
+++ b/cookbooks/gps-tile/recipes/default.rb
@@ -114,7 +114,7 @@ remote_directory "/srv/gps-tile.openstreetmap.org/html" do
   mode "755"
   files_owner "gpstile"
   files_group "gpstile"
   mode "755"
   files_owner "gpstile"
   files_group "gpstile"

-  files_mode 0o644
+  files_mode "644"

 end
 
 apache_module "headers"
 end
 
 apache_module "headers"

diff --git a/cookbooks/irc/recipes/default.rb b/cookbooks/irc/recipes/default.rb
index 60ef891107a48f1e011f8b13b774bda4986c080a..7fbc7ff743d77754a8f405de5d5fa1d8b936aba8 100644 (file)
--- a/cookbooks/irc/recipes/default.rb
+++ b/cookbooks/irc/recipes/default.rb
@@ -37,7 +37,7 @@ remote_directory "/srv/irc.openstreetmap.org/html" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 apache_site "irc.openstreetmap.org" do
 end
 
 apache_site "irc.openstreetmap.org" do

diff --git a/cookbooks/letsencrypt/recipes/default.rb b/cookbooks/letsencrypt/recipes/default.rb
index fad5eb27cf5cec822e99cde90d280db098b33ad2..3590fc94d106b7f2160687c5068d52dffad62f98 100644 (file)
--- a/cookbooks/letsencrypt/recipes/default.rb
+++ b/cookbooks/letsencrypt/recipes/default.rb
@@ -112,7 +112,7 @@ remote_directory "/srv/acme.openstreetmap.org/bin" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

 end
 
 directory "/srv/acme.openstreetmap.org/requests" do
 end
 
 directory "/srv/acme.openstreetmap.org/requests" do

diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index 4b44fa3d146a40cdc2160751d953fa9ef49107ac..8e7fbaa4be4e68a6103552e172970ef582ac655b 100644 (file)
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -41,7 +41,7 @@ action :create do
       mode "755"
       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]
       mode "755"
       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]

-      files_mode 0o755
+      files_mode "755"

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

diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb
index 4930c01b78f0a360237490b4957bed3e83c0427f..f70ad6afeb029f28f879c94c100502236fcd7257 100644 (file)
--- a/cookbooks/mediawiki/resources/skin.rb
+++ b/cookbooks/mediawiki/resources/skin.rb
@@ -40,7 +40,7 @@ action :create do
       mode "755"
       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]
       mode "755"
       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]

-      files_mode 0o755
+      files_mode "755"

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

diff --git a/cookbooks/munin/recipes/plugins.rb b/cookbooks/munin/recipes/plugins.rb
index 7a2ebd60dc96a9432c6f2cc15d1a2b3f225a23d3..7b8eb1a471bcc073b949efacd586a3298c45844e 100644 (file)
--- a/cookbooks/munin/recipes/plugins.rb
+++ b/cookbooks/munin/recipes/plugins.rb
@@ -26,7 +26,7 @@ remote_directory "/usr/local/share/munin/plugins" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

   purge true
 end
 
   purge true
 end
 


@@ -37,7 +37,7 @@ remote_directory "/etc/munin/plugin-conf.d" do
   mode "750"
   files_owner "root"
   files_group "root"
   mode "750"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

   purge false
   notifies :restart, "service[munin-node]"
 end
   purge false
   notifies :restart, "service[munin-node]"
 end

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 0b6e142acc3bb7971f952164c65ae3565daf20c8..881b7d5d89a3f6190b1092b656391f5213f34485 100644 (file)
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -80,7 +80,7 @@ remote_directory "/srv/munin.openstreetmap.org" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 # directory to put dumped files in
 end
 
 # directory to put dumped files in

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 5996b77dc49e8c671088c99d59202c50257c737d..0f505af0604f9002433b0928578768b9b4b62c14 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -34,7 +34,7 @@ remote_directory "/store/planet#html" do
   mode "0755"
   files_owner "root"
   files_group "root"
   mode "0755"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 remote_directory "/store/planet#cgi" do
 end
 
 remote_directory "/store/planet#cgi" do


@@ -45,7 +45,7 @@ remote_directory "/store/planet#cgi" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

 end
 
 remote_directory node[:planet][:dump][:xml_history_directory] do
 end
 
 remote_directory node[:planet][:dump][:xml_history_directory] do


@@ -55,7 +55,7 @@ remote_directory node[:planet][:dump][:xml_history_directory] do
   mode "775"
   files_owner "root"
   files_group "root"
   mode "775"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

 end
 
 remote_directory "/store/planet/cc-by-sa/full-experimental" do
 end
 
 remote_directory "/store/planet/cc-by-sa/full-experimental" do


@@ -65,7 +65,7 @@ remote_directory "/store/planet/cc-by-sa/full-experimental" do
   mode "775"
   files_owner "root"
   files_group "root"
   mode "775"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

 end
 
 [:xml_directory, :xml_history_directory,
 end
 
 [:xml_directory, :xml_history_directory,

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index 2579b511cf3fc8a00bf33de7cbb33100283afa4d..76b0148678df5d66a21366f158c24a4e263b72ca 100644 (file)
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -41,7 +41,7 @@ remote_directory "/opt/flush" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

 end
 
 execute "/opt/flush/Makefile" do
 end
 
 execute "/opt/flush/Makefile" do


@@ -60,7 +60,7 @@ remote_directory "/usr/local/bin" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

 end
 
 template "/usr/local/bin/users-agreed" do
 end
 
 template "/usr/local/bin/users-agreed" do


@@ -84,7 +84,7 @@ remote_directory "/store/planet/users_deleted" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 remote_directory "/store/planet/replication" do
 end
 
 remote_directory "/store/planet/replication" do


@@ -94,7 +94,7 @@ remote_directory "/store/planet/replication" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

 end
 
 directory "/store/planet/replication/changesets" do
 end
 
 directory "/store/planet/replication/changesets" do

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index d7a33bf33518bdf5722055f6a1a94b814587adeb..f38efb7b80fafd6a0623797a4b15ea2021baf72c 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -30,7 +30,7 @@ remote_directory "#{repository_directory}/hooks" do
   mode "755"
   files_owner "www-data"
   files_group "www-data"
   mode "755"
   files_owner "www-data"
   files_group "www-data"

-  files_mode 0o755
+  files_mode "755"

   purge false
 end
 
   purge false
 end
 

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 5a7a33af88a1de4e0926daaf5267387bb4fa4dd4..57ee431b085ac6deb617204ded22c64b558b58e9 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -115,7 +115,7 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   mode "755"
   files_owner "tile"
   files_group "tile"
   mode "755"
   files_owner "tile"
   files_group "tile"

-  files_mode 0o644
+  files_mode "644"

 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do


@@ -456,7 +456,7 @@ remote_directory "/usr/local/bin" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

 end
 
 template "/usr/local/bin/expire-tiles" do
 end
 
 template "/usr/local/bin/expire-tiles" do

diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index 768dd474824a78ce91e393e77c234d4a03c562f3..070a520aa4ff3b9550bed4b3b4d0299dacac8d43 100644 (file)
--- a/cookbooks/trac/recipes/default.rb
+++ b/cookbooks/trac/recipes/default.rb
@@ -56,7 +56,7 @@ remote_directory "/var/lib/trac/htdocs" do
   mode "755"
   files_owner "trac"
   files_group "trac"
   mode "755"
   files_owner "trac"
   files_group "trac"

-  files_mode 0o644
+  files_mode "644"

   purge true
 end
 
   purge true
 end
 


@@ -67,7 +67,7 @@ remote_directory "/var/lib/trac/templates" do
   mode "755"
   files_owner "trac"
   files_group "trac"
   mode "755"
   files_owner "trac"
   files_group "trac"

-  files_mode 0o644
+  files_mode "644"

   purge true
 end
 
   purge true
 end
 

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index 1c71a2fd0f08eb024401dae239ab9070dc042d06..c52007dd455da469ab566814f4c93093a6509a94 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -36,8 +36,6 @@ apache_site "default" do
   action [:disable]
 end
 
   action [:disable]
 end
 

-# Static legacy files used by external websites
-# eg: OpenLayers

 remote_directory "#{node[:web][:base_directory]}/static" do
   source "static"
   owner "root"
 remote_directory "#{node[:web][:base_directory]}/static" do
   source "static"
   owner "root"


@@ -45,7 +43,7 @@ remote_directory "#{node[:web][:base_directory]}/static" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 apache_site "www.openstreetmap.org" do
 end
 
 apache_site "www.openstreetmap.org" do

diff --git a/cookbooks/wordpress/resources/plugin.rb b/cookbooks/wordpress/resources/plugin.rb
index e2a57156b64e6a82feaed4b1c47aa5c70c538b9b..ccc8010d5d2dfaae52ce22d8ef064df0d55d6dac 100644 (file)
--- a/cookbooks/wordpress/resources/plugin.rb
+++ b/cookbooks/wordpress/resources/plugin.rb
@@ -37,7 +37,7 @@ action :create do
       mode "755"
       files_owner node[:wordpress][:user]
       files_group node[:wordpress][:group]
       mode "755"
       files_owner node[:wordpress][:user]
       files_group node[:wordpress][:group]

-      files_mode 0o755
+      files_mode "755"

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

diff --git a/cookbooks/wordpress/resources/theme.rb b/cookbooks/wordpress/resources/theme.rb
index e0d8c399b39f2a0ed5a698cf86d30f05cf2126b3..3e8fabe94af4e8faa52f5e79076d5edb4543f02c 100644 (file)
--- a/cookbooks/wordpress/resources/theme.rb
+++ b/cookbooks/wordpress/resources/theme.rb
@@ -37,7 +37,7 @@ action :create do
       mode "755"
       files_owner node[:wordpress][:user]
       files_group node[:wordpress][:group]
       mode "755"
       files_owner node[:wordpress][:user]
       files_group node[:wordpress][:group]

-      files_mode 0o644
+      files_mode "644"

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