Permalink
Browse files

COOK-318 use ::File instead of File in recipes

  • Loading branch information...
1 parent 9a17b13 commit cdb7197e69fb3dffdeebd387c75cc1e76c3af5a8 @jtimberman jtimberman committed Jan 16, 2011
Showing with 11 additions and 11 deletions.
  1. +1 −1 definitions/apache_module.rb
  2. +4 −4 definitions/apache_site.rb
  3. +1 −1 definitions/web_app.rb
  4. +2 −2 metadata.json
  5. +1 −1 metadata.rb
  6. +2 −2 recipes/mod_auth_openid.rb
@@ -37,7 +37,7 @@
execute "a2dismod #{params[:name]}" do
command "/usr/sbin/a2dismod #{params[:name]}"
notifies :restart, resources(:service => "apache2")
- only_if do File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.load") end
+ only_if do ::File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.load") end
end
end
end
@@ -25,16 +25,16 @@
command "/usr/sbin/a2ensite #{params[:name]}"
notifies :restart, resources(:service => "apache2")
not_if do
- File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") or
- File.symlink?("#{node[:apache][:dir]}/sites-enabled/000-#{params[:name]}")
+ ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") or
+ ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/000-#{params[:name]}")
end
- only_if do File.exists?("#{node[:apache][:dir]}/sites-available/#{params[:name]}") end
+ only_if do ::File.exists?("#{node[:apache][:dir]}/sites-available/#{params[:name]}") end
end
else
execute "a2dissite #{params[:name]}" do
command "/usr/sbin/a2dissite #{params[:name]}"
notifies :restart, resources(:service => "apache2")
- only_if do File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") end
+ only_if do ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") end
end
end
end
@@ -38,7 +38,7 @@
:application_name => application_name,
:params => params
)
- if File.exists?("#{node[:apache][:dir]}/sites-enabled/#{application_name}.conf")
+ if ::File.exists?("#{node[:apache][:dir]}/sites-enabled/#{application_name}.conf")
notifies :reload, resources(:service => "apache2"), :delayed
end
end
View
@@ -496,5 +496,5 @@
"apache2::mod_ssl": "Apache module 'ssl' with config file, adds port 443 to listen_ports",
"apache2::mod_status": "Apache module 'status' with config file"
},
- "version": "0.99.1"
-}
+ "version": "0.99.2"
+}
View
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.99.1"
+version "0.99.2"
recipe "apache2", "Main Apache configuration"
recipe "apache2::mod_alias", "Apache module 'alias' with config file"
recipe "apache2::mod_auth_basic", "Apache module 'auth_basic'"
@@ -55,9 +55,9 @@
EOH
case node[:platform]
when "arch"
- not_if { File.exists?("/usr/lib/httpd/modules/mod_auth_openid.so") }
+ not_if { ::File.exists?("/usr/lib/httpd/modules/mod_auth_openid.so") }
else
- not_if { File.exists?("/usr/lib/apache2/modules/mod_auth_openid.so") }
+ not_if { ::File.exists?("/usr/lib/apache2/modules/mod_auth_openid.so") }
end
end

0 comments on commit cdb7197

Please sign in to comment.