diff --git a/activemq/metadata.json b/activemq/metadata.json index a0b36d112..e4c5b2d13 100644 --- a/activemq/metadata.json +++ b/activemq/metadata.json @@ -26,7 +26,7 @@ ] }, "license": "Apache 2.0", - "version": "0.3.2", + "version": "0.3.3", "maintainer": "Opscode, Inc.", "suggestions": { }, @@ -39,4 +39,4 @@ }, "description": "Installs activemq and sets it up as a runit service", "long_description": "= DESCRIPTION:\n\nInstalls activemq and sets up a runit service.\n\n= REQUIREMENTS:\n\nTested on Ubuntu 9.04.\n\nOpscode cookbooks:\n\n* java\n* runit\n\n= ATTRIBUTES:\n\n* activemq[:mirror] - download URL up to the apache/activemq/apache-activemq directory.\n* activemq[:version] - version to install.\n\n= USAGE:\n\nInclude the default recipe on systems where you want to run activemq. At this time the cookbook doesn't use any custom configuration for activemq.\n\n= LICENSE AND AUTHOR:\n\nAuthor:: Joshua Timberman ()\n\nCopyright:: 2009, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" - } \ No newline at end of file + } diff --git a/activemq/metadata.rb b/activemq/metadata.rb index c09ad8c59..5ed26736d 100644 --- a/activemq/metadata.rb +++ b/activemq/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Installs activemq and sets it up as a runit service" long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version "0.3.2" +version "0.3.3" recipe "activemq", "Installs ActiveMQ from source and sets it up as a runit service" diff --git a/activemq/recipes/default.rb b/activemq/recipes/default.rb index da2eed94b..e6a8b035a 100644 --- a/activemq/recipes/default.rb +++ b/activemq/recipes/default.rb @@ -23,7 +23,7 @@ version = node[:activemq][:version] mirror = node[:activemq][:mirror] -unless File.exists?("/opt/apache-activemq-#{version}/bin/activemq") +unless ::File.exists?("/opt/apache-activemq-#{version}/bin/activemq") remote_file "/tmp/apache-activemq-#{version}-bin.tar.gz" do source "#{mirror}/apache/activemq/apache-activemq/#{version}/apache-activemq-#{version}-bin.tar.gz" mode "0644" diff --git a/apache2/definitions/apache_module.rb b/apache2/definitions/apache_module.rb index 2bd739e88..ff4879167 100644 --- a/apache2/definitions/apache_module.rb +++ b/apache2/definitions/apache_module.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 diff --git a/apache2/definitions/apache_site.rb b/apache2/definitions/apache_site.rb index 7316e0135..a4bc774be 100644 --- a/apache2/definitions/apache_site.rb +++ b/apache2/definitions/apache_site.rb @@ -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 diff --git a/apache2/definitions/web_app.rb b/apache2/definitions/web_app.rb index b532708a7..48342d048 100644 --- a/apache2/definitions/web_app.rb +++ b/apache2/definitions/web_app.rb @@ -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 diff --git a/apache2/metadata.json b/apache2/metadata.json index 19fdf38f5..2bf9266b6 100644 --- a/apache2/metadata.json +++ b/apache2/metadata.json @@ -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" -} \ No newline at end of file + "version": "0.99.2" +} diff --git a/apache2/metadata.rb b/apache2/metadata.rb index 75209c019..bc7ff7441 100644 --- a/apache2/metadata.rb +++ b/apache2/metadata.rb @@ -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'" diff --git a/apache2/recipes/mod_auth_openid.rb b/apache2/recipes/mod_auth_openid.rb index cd933af23..cc33eb887 100644 --- a/apache2/recipes/mod_auth_openid.rb +++ b/apache2/recipes/mod_auth_openid.rb @@ -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 diff --git a/application/metadata.json b/application/metadata.json index dfb0b352b..bc2145e22 100644 --- a/application/metadata.json +++ b/application/metadata.json @@ -41,7 +41,7 @@ "platforms": { }, "name": "application", - "version": "0.8.0", + "version": "0.8.1", "conflicting": { }, "license": "Apache 2.0", @@ -55,4 +55,4 @@ "application::java_webapp": "Deploys a Java web application WAR specified in a data bag with the remote_file resource", "application::tomcat": "Sets up the deployed Java application with Tomcat as the servlet container" } -} \ No newline at end of file +} diff --git a/application/metadata.rb b/application/metadata.rb index 21735692d..c0b145584 100644 --- a/application/metadata.rb +++ b/application/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Deploys and configures a variety of applications defined from databag 'apps'" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.8.0" +version "0.8.1" recipe "application", "Loads application databags and selects recipes to use" recipe "application::java_webapp", "Deploys a Java web application WAR specified in a data bag with the remote_file resource" recipe "application::passenger-nginx", "Installs Ruby Enterprise with Passenger under Nginx" diff --git a/application/recipes/rails.rb b/application/recipes/rails.rb index 163999077..0a74b3157 100644 --- a/application/recipes/rails.rb +++ b/application/recipes/rails.rb @@ -87,11 +87,11 @@ if app.has_key?("deploy_key") ruby_block "write_key" do block do - f = File.open("#{app['deploy_to']}/id_deploy", "w") + f = ::File.open("#{app['deploy_to']}/id_deploy", "w") f.print(app["deploy_key"]) f.close end - not_if do File.exists?("#{app['deploy_to']}/id_deploy"); end + not_if do ::File.exists?("#{app['deploy_to']}/id_deploy"); end end file "#{app['deploy_to']}/id_deploy" do diff --git a/application/recipes/rails_nginx_ree_passenger.rb b/application/recipes/rails_nginx_ree_passenger.rb index 8d08beb5c..73522e7e4 100644 --- a/application/recipes/rails_nginx_ree_passenger.rb +++ b/application/recipes/rails_nginx_ree_passenger.rb @@ -89,11 +89,11 @@ if app.has_key?("deploy_key") ruby_block "write_key" do block do - f = File.open("#{app['deploy_to']}/id_deploy", "w") + f = ::File.open("#{app['deploy_to']}/id_deploy", "w") f.print(app["deploy_key"]) f.close end - not_if do File.exists?("#{app['deploy_to']}/id_deploy"); end + not_if do ::File.exists?("#{app['deploy_to']}/id_deploy"); end end file "#{app['deploy_to']}/id_deploy" do diff --git a/application/recipes/tomcat.rb b/application/recipes/tomcat.rb index e6f8fa523..f8a4d37af 100644 --- a/application/recipes/tomcat.rb +++ b/application/recipes/tomcat.rb @@ -33,7 +33,7 @@ notifies :restart, resources(:service => "tomcat") end -if File.symlink?(File.join(node['tomcat']['context_dir'], "ROOT.xml")) +if ::File.symlink?(::File.join(node['tomcat']['context_dir'], "ROOT.xml")) d = resources(:remote_file => app['id']) d.notifies :restart, resources(:service => "tomcat") -end \ No newline at end of file +end diff --git a/application/recipes/unicorn.rb b/application/recipes/unicorn.rb index d43c486ef..3d809ab3d 100644 --- a/application/recipes/unicorn.rb +++ b/application/recipes/unicorn.rb @@ -31,7 +31,7 @@ unicorn_config "/etc/unicorn/#{app['id']}.rb" do listen({ node[:unicorn][:port] => node[:unicorn][:options] }) - working_directory File.join(app['deploy_to'], 'current') + working_directory ::File.join(app['deploy_to'], 'current') worker_timeout node[:unicorn][:worker_timeout] preload_app node[:unicorn][:preload_app] worker_processes node[:unicorn][:worker_processes] @@ -45,7 +45,7 @@ run_restart false end -if File.exists?(File.join(app['deploy_to'], "current")) +if ::File.exists?(::File.join(app['deploy_to'], "current")) d = resources(:deploy => app['id']) d.restart_command do execute "/etc/init.d/#{app['id']} hup" diff --git a/chef/metadata.json b/chef/metadata.json index 141f0d5a3..67f0d2b5d 100644 --- a/chef/metadata.json +++ b/chef/metadata.json @@ -84,5 +84,5 @@ "chef::bootstrap_server": "Set up rubygem installed chef server", "chef::server_proxy": "Configures Apache2 proxy for API and WebUI" }, - "version": "0.22.0" -} \ No newline at end of file + "version": "0.22.1" +} diff --git a/chef/metadata.rb b/chef/metadata.rb index 05b6a088a..8c5942482 100644 --- a/chef/metadata.rb +++ b/chef/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Installs and configures Chef for chef-client and chef-server" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.22.0" +version "0.22.1" recipe "chef", "Default recipe is empty, use one of the other recipes." recipe "chef::client", "Sets up a client to talk to a chef-server" recipe "chef::client_service", "Sets up a client daemon to run periodically" diff --git a/chef/recipes/client.rb b/chef/recipes/client.rb index 1c338d1dc..4b3ace2f3 100644 --- a/chef/recipes/client.rb +++ b/chef/recipes/client.rb @@ -41,5 +41,5 @@ end log "Add the chef::delete_validation recipe to the run list to remove the #{Chef::Config[:validation_key]}." do - only_if { File.exists?(Chef::Config[:validation_key]) } + only_if { ::File.exists?(Chef::Config[:validation_key]) } end diff --git a/chef/recipes/server_proxy.rb b/chef/recipes/server_proxy.rb index 51b6a4a31..98d39aa5a 100644 --- a/chef/recipes/server_proxy.rb +++ b/chef/recipes/server_proxy.rb @@ -53,7 +53,7 @@ openssl req -subj "#{node[:chef][:server_ssl_req]}" -new -x509 -nodes -sha1 -days 3650 -key #{node[:chef][:server_fqdn]}.key > #{node[:chef][:server_fqdn]}.crt cat #{node[:chef][:server_fqdn]}.key #{node[:chef][:server_fqdn]}.crt > #{node[:chef][:server_fqdn]}.pem EOH - not_if { File.exists?("/etc/chef/certificates/#{node[:chef][:server_fqdn]}.pem") } + not_if { ::File.exists?("/etc/chef/certificates/#{node[:chef][:server_fqdn]}.pem") } end web_app "chef_server" do diff --git a/glassfish/metadata.json b/glassfish/metadata.json index d45476540..a024f52a3 100644 --- a/glassfish/metadata.json +++ b/glassfish/metadata.json @@ -26,7 +26,7 @@ ] }, "license": "Apache 2.0", - "version": "0.3.0", + "version": "0.3.1", "maintainer": "Opscode, Inc.", "suggestions": { }, @@ -39,4 +39,4 @@ }, "description": "Installs/Configures Glassfish", "long_description": "= DESCRIPTION:\n\n= REQUIREMENTS:\n\n= ATTRIBUTES: \n\n= USAGE:\n\n" - } \ No newline at end of file + } diff --git a/glassfish/metadata.rb b/glassfish/metadata.rb index 4de87109d..2c5c08e01 100644 --- a/glassfish/metadata.rb +++ b/glassfish/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Installs/Configures Glassfish" long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version "0.3.0" +version "0.3.1" recipe "glassfish", "Main Glassfish configuration" %w{redhat centos debian ubuntu}.each do |os| diff --git a/glassfish/recipes/default.rb b/glassfish/recipes/default.rb index b07e4dd84..721412e5a 100644 --- a/glassfish/recipes/default.rb +++ b/glassfish/recipes/default.rb @@ -52,7 +52,7 @@ execute "install-glassfish" do command "/tmp/glassfish.sh -a #{answer_file} -s" - creates File.join(node[:glassfish][:INSTALL_HOME],"uninstall.sh") + creates ::File.join(node[:glassfish][:INSTALL_HOME],"uninstall.sh") user node[:glassfish][:systemuser] action :run end diff --git a/munin/metadata.json b/munin/metadata.json index e9507bbdc..9fbe235e1 100644 --- a/munin/metadata.json +++ b/munin/metadata.json @@ -40,5 +40,5 @@ "munin::client": "Instlls munin and configures a client by searching for the server, which should have a role named monitoring", "munin::server": "Installs munin and configures a server, node should have the role 'monitoring' so clients can find it" }, - "version": "0.10.0" -} \ No newline at end of file + "version": "0.10.1" +} diff --git a/munin/metadata.rb b/munin/metadata.rb index 3a848c8a3..417451ffb 100644 --- a/munin/metadata.rb +++ b/munin/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Installs and configures munin" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.10.0" +version "0.10.1" depends "apache2" supports "arch" diff --git a/munin/recipes/server.rb b/munin/recipes/server.rb index d1c9f6ed0..7e9a2f355 100644 --- a/munin/recipes/server.rb +++ b/munin/recipes/server.rb @@ -68,7 +68,7 @@ source "apache2.conf.erb" mode 0644 variables :public_domain => public_domain - if File.symlink?("#{node[:apache][:dir]}/sites-enabled/munin.conf") + if ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/munin.conf") notifies :reload, resources(:service => "apache2") end end diff --git a/nagios/metadata.json b/nagios/metadata.json index 05fc3a48a..fb45c0e35 100644 --- a/nagios/metadata.json +++ b/nagios/metadata.json @@ -37,5 +37,5 @@ "nagios::client": "Installs and configures a nagios client with nrpe", "nagios::server": "Installs and configures a nagios server" }, - "version": "0.4.3" -} \ No newline at end of file + "version": "0.4.4" +} diff --git a/nagios/metadata.rb b/nagios/metadata.rb index f63e83412..15a0e1816 100644 --- a/nagios/metadata.rb +++ b/nagios/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Installs and configures nagios" long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version "0.4.3" +version "0.4.4" recipe "nagios", "Includes the client recipe." recipe "nagios::client", "Installs and configures a nagios client with nrpe" diff --git a/nagios/recipes/server.rb b/nagios/recipes/server.rb index 54d81ec5e..d2cea3b9a 100644 --- a/nagios/recipes/server.rb +++ b/nagios/recipes/server.rb @@ -117,7 +117,7 @@ source "apache2.conf.erb" mode 0644 variables :public_domain => public_domain - if File.symlink?("#{node[:apache][:dir]}/sites-enabled/nagios3.conf") + if ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/nagios3.conf") notifies :reload, resources(:service => "apache2") end end diff --git a/nginx/definitions/nginx_site.rb b/nginx/definitions/nginx_site.rb index cdc5d27f2..c55c08c52 100644 --- a/nginx/definitions/nginx_site.rb +++ b/nginx/definitions/nginx_site.rb @@ -23,13 +23,13 @@ execute "nxensite #{params[:name]}" do command "/usr/sbin/nxensite #{params[:name]}" notifies :restart, resources(:service => "nginx") - not_if do File.symlink?("#{node[:nginx][:dir]}/sites-enabled/#{params[:name]}") end + not_if do ::File.symlink?("#{node[:nginx][:dir]}/sites-enabled/#{params[:name]}") end end else execute "nxdissite #{params[:name]}" do command "/usr/sbin/nxdissite #{params[:name]}" notifies :restart, resources(:service => "nginx") - only_if do File.symlink?("#{node[:nginx][:dir]}/sites-enabled/#{params[:name]}") end + only_if do ::File.symlink?("#{node[:nginx][:dir]}/sites-enabled/#{params[:name]}") end end end end diff --git a/nginx/metadata.json b/nginx/metadata.json index 7bc47cca3..188fe0b08 100644 --- a/nginx/metadata.json +++ b/nginx/metadata.json @@ -234,7 +234,7 @@ ] }, - "version": "0.14.3", + "version": "0.14.4", "groupings": { }, "long_description": "", @@ -252,4 +252,4 @@ }, "conflicting": { } - } \ No newline at end of file + } diff --git a/nginx/metadata.rb b/nginx/metadata.rb index 1f1360ff8..251e18b37 100644 --- a/nginx/metadata.rb +++ b/nginx/metadata.rb @@ -2,7 +2,7 @@ maintainer_email "cookbooks@opscode.com" license "Apache 2.0" description "Installs and configures nginx" -version "0.14.3" +version "0.14.4" recipe "nginx", "Installs nginx package and sets up configuration with Debian apache style with sites-enabled/sites-available" recipe "nginx::source", "Installs nginx from source and sets up configuration with Debian apache style with sites-enabled/sites-available" diff --git a/rabbitmq_chef/metadata.json b/rabbitmq_chef/metadata.json index 975feb9ea..0a470908a 100644 --- a/rabbitmq_chef/metadata.json +++ b/rabbitmq_chef/metadata.json @@ -32,7 +32,7 @@ ] }, "license": "Apache 2.0", - "version": "0.10.3", + "version": "0.10.4", "maintainer": "Opscode, Inc.", "suggestions": { }, @@ -45,4 +45,4 @@ }, "description": "Installs the RabbitMQ AMQP Broker for use on a Chef Server.", "long_description": "" - } \ No newline at end of file + } diff --git a/rabbitmq_chef/metadata.rb b/rabbitmq_chef/metadata.rb index f0ed7ea89..e518bd27b 100644 --- a/rabbitmq_chef/metadata.rb +++ b/rabbitmq_chef/metadata.rb @@ -2,7 +2,7 @@ maintainer_email "cookbooks@opscode.com" license "Apache 2.0" description "Installs the RabbitMQ AMQP Broker for use on a Chef Server." -version "0.10.3" +version "0.10.4" recipe "rabbitmq_chef", "Install and configure rabbitmq specifically for a Chef Server" diff --git a/rabbitmq_chef/recipes/default.rb b/rabbitmq_chef/recipes/default.rb index 1c915018d..cf173154f 100644 --- a/rabbitmq_chef/recipes/default.rb +++ b/rabbitmq_chef/recipes/default.rb @@ -26,7 +26,7 @@ def debian_before_squeeze? if (platform?("ubuntu") && node.platform_version.to_f <= 9.10) || debian_before_squeeze? include_recipe("erlang") - rabbitmq_dpkg_path = File.join(Chef::Config[:file_cache_path], "/", "rabbitmq-server_1.7.2-1_all.deb") + rabbitmq_dpkg_path = ::File.join(Chef::Config[:file_cache_path], "/", "rabbitmq-server_1.7.2-1_all.deb") remote_file(rabbitmq_dpkg_path) do checksum "ea2bbbb41f6d539884498bbdb5c7d3984643127dbdad5e9f7c28ec9df76b1355" diff --git a/redmine/metadata.json b/redmine/metadata.json index 8f8448a33..0129f3c3e 100644 --- a/redmine/metadata.json +++ b/redmine/metadata.json @@ -35,7 +35,7 @@ ] }, "license": "Apache 2.0", - "version": "0.10.2", + "version": "0.10.3", "maintainer": "Opscode, Inc.", "suggestions": { }, @@ -48,4 +48,4 @@ }, "description": "Installs and configures redmine as a Rails app in passenger+apache2", "long_description": "" - } \ No newline at end of file + } diff --git a/redmine/metadata.rb b/redmine/metadata.rb index 4f0274128..7f9091b3a 100644 --- a/redmine/metadata.rb +++ b/redmine/metadata.rb @@ -2,7 +2,7 @@ maintainer_email "cookbooks@opscode.com" license "Apache 2.0" description "Installs and configures redmine as a Rails app in passenger+apache2" -version "0.10.2" +version "0.10.3" recipe "redmine", "Installs and configures redmine under passenger + apache2" diff --git a/redmine/recipes/default.rb b/redmine/recipes/default.rb index de27b5de9..7b90ed61b 100644 --- a/redmine/recipes/default.rb +++ b/redmine/recipes/default.rb @@ -31,7 +31,7 @@ tar xf redmine-#{node[:redmine][:version]}.tar.gz chown -R #{node[:apache][:user]} redmine-#{node[:redmine][:version]} EOH - not_if { File.exists?("/srv/redmine-#{node[:redmine][:version]}/Rakefile") } + not_if { ::File.exists?("/srv/redmine-#{node[:redmine][:version]}/Rakefile") } end link "/srv/redmine" do @@ -62,7 +62,7 @@ execute "rake db:migrate RAILS_ENV='production'" do user node[:apache][:user] cwd "/srv/redmine-#{node[:redmine][:version]}" - not_if { File.exists?("/srv/redmine-#{node[:redmine][:version]}/db/schema.rb") } + not_if { ::File.exists?("/srv/redmine-#{node[:redmine][:version]}/db/schema.rb") } end web_app "redmine" do diff --git a/rsyslog/metadata.json b/rsyslog/metadata.json index 35b1febd1..725cbb6bb 100644 --- a/rsyslog/metadata.json +++ b/rsyslog/metadata.json @@ -92,5 +92,5 @@ "rsyslog::client": "Sets up a client to log to a remote rsyslog server", "rsyslog::server": "Sets up an rsyslog server" }, - "version": "0.9.4" -} \ No newline at end of file + "version": "0.9.5" +} diff --git a/rsyslog/metadata.rb b/rsyslog/metadata.rb index 119914215..27234ec26 100644 --- a/rsyslog/metadata.rb +++ b/rsyslog/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Installs and configures rsyslog" long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version "0.9.4" +version "0.9.5" recipe "rsyslog", "Installs rsyslog" recipe "rsyslog::client", "Sets up a client to log to a remote rsyslog server" diff --git a/rsyslog/recipes/client.rb b/rsyslog/recipes/client.rb index 81bca908c..55f44b941 100644 --- a/rsyslog/recipes/client.rb +++ b/rsyslog/recipes/client.rb @@ -38,6 +38,6 @@ file "/etc/rsyslog.d/server.conf" do action :delete notifies :reload, resources(:service => "rsyslog"), :delayed - only_if do File.exists?("/etc/rsyslog.d/server.conf") end + only_if do ::File.exists?("/etc/rsyslog.d/server.conf") end end end diff --git a/rsyslog/recipes/server.rb b/rsyslog/recipes/server.rb index b7e247940..658d60ea6 100644 --- a/rsyslog/recipes/server.rb +++ b/rsyslog/recipes/server.rb @@ -42,7 +42,7 @@ action :delete backup false notifies :reload, resources(:service => "rsyslog"), :delayed - only_if do File.exists?("/etc/rsyslog.d/remote.conf") end + only_if do ::File.exists?("/etc/rsyslog.d/remote.conf") end end template "/etc/cron.d/rsyslog_gz" do diff --git a/runit/metadata.json b/runit/metadata.json index ee6fa04f4..f25fbb2ef 100644 --- a/runit/metadata.json +++ b/runit/metadata.json @@ -104,5 +104,5 @@ "recipes": { "runit": "Installs and configures runit" }, - "version": "0.14.1" -} \ No newline at end of file + "version": "0.14.2" +} diff --git a/runit/metadata.rb b/runit/metadata.rb index 29dc39729..c748b9351 100644 --- a/runit/metadata.rb +++ b/runit/metadata.rb @@ -2,7 +2,7 @@ maintainer_email "cookbooks@opscode.com" license "Apache 2.0" description "Installs runit and provides runit_service definition" -version "0.14.1" +version "0.14.2" recipe "runit", "Installs and configures runit" diff --git a/runit/recipes/default.rb b/runit/recipes/default.rb index 7f80c15a6..25f818e98 100644 --- a/runit/recipes/default.rb +++ b/runit/recipes/default.rb @@ -66,7 +66,7 @@ source "runsvdir" mode 0644 notifies :run, resources(:execute => "start-runsvdir"), :immediately - only_if do File.directory?("/etc/event.d") end + only_if do ::File.directory?("/etc/event.d") end end end end diff --git a/teamspeak/metadata.json b/teamspeak/metadata.json index 2ce3f2df2..8259ae5e7 100644 --- a/teamspeak/metadata.json +++ b/teamspeak/metadata.json @@ -20,7 +20,7 @@ ] }, "license": "Apache 2.0", - "version": "0.8.0", + "version": "0.8.1", "providing": { }, "recipes": { @@ -33,4 +33,4 @@ "groupings": { }, "long_description": "" - } \ No newline at end of file + } diff --git a/teamspeak/metadata.rb b/teamspeak/metadata.rb index da5796c9f..99e80e13e 100644 --- a/teamspeak/metadata.rb +++ b/teamspeak/metadata.rb @@ -2,7 +2,7 @@ maintainer_email "cookbooks@opscode.com" license "Apache 2.0" description "Installs teamspeak and enables service" -version "0.8" +version "0.8.1" depends "php" supports "ubuntu" recipe "teamspeak", "Installs and configures teamspeak2" diff --git a/teamspeak/recipes/default.rb b/teamspeak/recipes/default.rb index 12100f42c..fbfbf8280 100644 --- a/teamspeak/recipes/default.rb +++ b/teamspeak/recipes/default.rb @@ -49,7 +49,7 @@ wget http://softlayer.dl.sourceforge.net/sourceforge/tsdisplay/TeamspeakDisplay-PR3.zip unzip TeamSpeakDisplay-PR3.zip EOH - not_if { File.exists?("/srv/www/tsdisplay/TeamspeakDisplay-PR3.zip") } + not_if { ::File.exists?("/srv/www/tsdisplay/TeamspeakDisplay-PR3.zip") } end template "/srv/www/tsdisplay/demo.php" do diff --git a/tomcat6/metadata.json b/tomcat6/metadata.json index 134b59d6a..a1181c3a9 100644 --- a/tomcat6/metadata.json +++ b/tomcat6/metadata.json @@ -46,5 +46,5 @@ "recipes": { "tomcat6": "Main Tomcat 6 configuration" }, - "version": "0.5.3" -} \ No newline at end of file + "version": "0.5.4" +} diff --git a/tomcat6/metadata.rb b/tomcat6/metadata.rb index e9b0c1856..e71b51fbe 100644 --- a/tomcat6/metadata.rb +++ b/tomcat6/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Installs and configures all aspects of tomcat6 using custom local installation" long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version "0.5.3" +version "0.5.4" recipe "tomcat6", "Main Tomcat 6 configuration" %w{redhat centos}.each do |os| diff --git a/tomcat6/recipes/default.rb b/tomcat6/recipes/default.rb index ce33475d6..b814ae7f0 100644 --- a/tomcat6/recipes/default.rb +++ b/tomcat6/recipes/default.rb @@ -45,7 +45,7 @@ end [:temp,:logs,:webapps,:conf].each do |dir| - link File.join(node[:tomcat6][:home],dir.to_s) do + link ::File.join(node[:tomcat6][:home],dir.to_s) do to node[:tomcat6][dir] # use values from attributes end end @@ -67,7 +67,7 @@ tomcat_version_name_tgz = "#{tomcat_version_name}.tar.gz" user "root" cwd usr_share_dir - not_if do File.exists?(File.join(usr_share_dir,tomcat_version_name)) end + not_if do ::File.exists?(::File.join(usr_share_dir,tomcat_version_name)) end code <<-EOH wget http://archive.apache.org/dist/tomcat/tomcat-6/v#{node[:tomcat6][:version]}/bin/#{tomcat_version_name_tgz} tar -zxf #{tomcat_version_name_tgz} @@ -79,21 +79,21 @@ # just to have it here, may be overriden through own configuration bash "install_tomcat6_etc" do user node[:tomcat6][:user] - not_if do File.exists?(File.join(node[:tomcat6][:conf],"tomcat6.conf")) end + not_if do ::File.exists?(::File.join(node[:tomcat6][:conf],"tomcat6.conf")) end cwd node[:tomcat6][:conf] code <<-EOH cp -r #{usr_share_dir}/apache-tomcat-#{node[:tomcat6][:version]}/conf/* . EOH end -link File.join(node[:tomcat6][:home],"lib") do - to File.join(usr_share_dir,"apache-tomcat-#{node[:tomcat6][:version]}","lib") +link ::File.join(node[:tomcat6][:home],"lib") do + to ::File.join(usr_share_dir,"apache-tomcat-#{node[:tomcat6][:version]}","lib") notifies :run, resources(:bash => "update_manager"), :immediately notifies :restart, resources(:service => "tomcat6"), :delayed end -link File.join(node[:tomcat6][:home],"bin") do - to File.join(usr_share_dir,"apache-tomcat-#{node[:tomcat6][:version]}","bin") +link ::File.join(node[:tomcat6][:home],"bin") do + to ::File.join(usr_share_dir,"apache-tomcat-#{node[:tomcat6][:version]}","bin") notifies :restart, resources(:service => "tomcat6"), :delayed end @@ -168,7 +168,7 @@ group "root" end -cookbook_file File.join(node[:tomcat6][:dir],"logging.properties") do +cookbook_file ::File.join(node[:tomcat6][:dir],"logging.properties") do source "logging.properties" mode 0644 owner "root" diff --git a/trac/metadata.json b/trac/metadata.json index b5f1fabcd..408a3486b 100644 --- a/trac/metadata.json +++ b/trac/metadata.json @@ -5,7 +5,7 @@ "replacing": { }, - "version": "0.1.0", + "version": "0.1.1", "platforms": { }, diff --git a/trac/metadata.rb b/trac/metadata.rb index 24e9e1dd4..ade185692 100644 --- a/trac/metadata.rb +++ b/trac/metadata.rb @@ -3,5 +3,5 @@ license "Apache 2.0" description "Installs/Configures Trac" long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version "0.1" +version "0.1.1" depends "apache2" diff --git a/trac/recipes/default.rb b/trac/recipes/default.rb index 398cec132..0f2adc21e 100644 --- a/trac/recipes/default.rb +++ b/trac/recipes/default.rb @@ -7,9 +7,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -46,7 +46,7 @@ group "root" mode 0755 variables( - :trac_environment => "#{node[:trac][:basedir]}/environment" + :trac_environment => "#{node[:trac][:basedir]}/environment" ) end @@ -72,13 +72,13 @@ group "www-data" mode 0775 variables( - :trac_project_desc => node[:trac][:project_description], - :trac_project_name => node[:trac][:project_name], - :trac_mainnav => node[:trac][:mainnav], + :trac_project_desc => node[:trac][:project_description], + :trac_project_name => node[:trac][:project_name], + :trac_mainnav => node[:trac][:mainnav], :trac_metanav => node[:trac][:metanav], - :trac_url => node[:trac][:vhosts].first, - :trac_svn_branches => node[:trac][:svn_branches], - :trac_svn_tags => node[:trac][:svn_tags], + :trac_url => node[:trac][:vhosts].first, + :trac_svn_branches => node[:trac][:svn_branches], + :trac_svn_tags => node[:trac][:svn_tags], :trac_svn_repo => node[:trac][:svn_dir] ) end @@ -90,9 +90,9 @@ group "root" mode 0644 variables( - :trac_dir => node[:trac][:basedir], - :trac_project_name => node[:trac][:project_name], - :trac_required_groups => node[:trac][:required_groups], + :trac_dir => node[:trac][:basedir], + :trac_project_name => node[:trac][:project_name], + :trac_required_groups => node[:trac][:required_groups], :trac_vhosts => node[:trac][:vhosts] ) end @@ -108,6 +108,5 @@ minute "0" command "trac-admin #{node[:trac][:basedir]}/environment resync" user "www-data" - only_if do File.exists?("#{node[:trac][:basedir]}/environment") end + only_if do ::File.exists?("#{node[:trac][:basedir]}/environment") end end -