Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 8c7b0c524af9304160eae6e6fb40a85af86bcb9e 1 parent ea73a89
Joshua Timberman authored January 15, 2011

Showing 53 changed files with 96 additions and 97 deletions. Show diff stats Hide diff stats

  1. 4  activemq/metadata.json
  2. 2  activemq/metadata.rb
  3. 2  activemq/recipes/default.rb
  4. 2  apache2/definitions/apache_module.rb
  5. 8  apache2/definitions/apache_site.rb
  6. 2  apache2/definitions/web_app.rb
  7. 4  apache2/metadata.json
  8. 2  apache2/metadata.rb
  9. 4  apache2/recipes/mod_auth_openid.rb
  10. 4  application/metadata.json
  11. 2  application/metadata.rb
  12. 4  application/recipes/rails.rb
  13. 4  application/recipes/rails_nginx_ree_passenger.rb
  14. 4  application/recipes/tomcat.rb
  15. 4  application/recipes/unicorn.rb
  16. 4  chef/metadata.json
  17. 2  chef/metadata.rb
  18. 2  chef/recipes/client.rb
  19. 2  chef/recipes/server_proxy.rb
  20. 4  glassfish/metadata.json
  21. 2  glassfish/metadata.rb
  22. 2  glassfish/recipes/default.rb
  23. 4  munin/metadata.json
  24. 2  munin/metadata.rb
  25. 2  munin/recipes/server.rb
  26. 4  nagios/metadata.json
  27. 2  nagios/metadata.rb
  28. 2  nagios/recipes/server.rb
  29. 4  nginx/definitions/nginx_site.rb
  30. 4  nginx/metadata.json
  31. 2  nginx/metadata.rb
  32. 4  rabbitmq_chef/metadata.json
  33. 2  rabbitmq_chef/metadata.rb
  34. 2  rabbitmq_chef/recipes/default.rb
  35. 4  redmine/metadata.json
  36. 2  redmine/metadata.rb
  37. 4  redmine/recipes/default.rb
  38. 4  rsyslog/metadata.json
  39. 2  rsyslog/metadata.rb
  40. 2  rsyslog/recipes/client.rb
  41. 2  rsyslog/recipes/server.rb
  42. 4  runit/metadata.json
  43. 2  runit/metadata.rb
  44. 2  runit/recipes/default.rb
  45. 4  teamspeak/metadata.json
  46. 2  teamspeak/metadata.rb
  47. 2  teamspeak/recipes/default.rb
  48. 4  tomcat6/metadata.json
  49. 2  tomcat6/metadata.rb
  50. 16  tomcat6/recipes/default.rb
  51. 2  trac/metadata.json
  52. 2  trac/metadata.rb
  53. 27  trac/recipes/default.rb
4  activemq/metadata.json
@@ -26,7 +26,7 @@
26 26
       ]
27 27
     },
28 28
     "license": "Apache 2.0",
29  
-    "version": "0.3.2",
  29
+    "version": "0.3.3",
30 30
     "maintainer": "Opscode, Inc.",
31 31
     "suggestions": {
32 32
     },
@@ -39,4 +39,4 @@
39 39
     },
40 40
     "description": "Installs activemq and sets it up as a runit service",
41 41
     "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 (<joshua@opscode.com>)\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"
42  
-  }
  42
+  }
2  activemq/metadata.rb
@@ -3,7 +3,7 @@
3 3
 license          "Apache 2.0"
4 4
 description      "Installs activemq and sets it up as a runit service"
5 5
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6  
-version          "0.3.2"
  6
+version          "0.3.3"
7 7
 
8 8
 recipe "activemq", "Installs ActiveMQ from source and sets it up as a runit service" 
9 9
 
2  activemq/recipes/default.rb
@@ -23,7 +23,7 @@
23 23
 version = node[:activemq][:version]
24 24
 mirror = node[:activemq][:mirror]
25 25
 
26  
-unless File.exists?("/opt/apache-activemq-#{version}/bin/activemq")
  26
+unless ::File.exists?("/opt/apache-activemq-#{version}/bin/activemq")
27 27
   remote_file "/tmp/apache-activemq-#{version}-bin.tar.gz" do
28 28
     source "#{mirror}/apache/activemq/apache-activemq/#{version}/apache-activemq-#{version}-bin.tar.gz"
29 29
     mode "0644"
2  apache2/definitions/apache_module.rb
@@ -37,7 +37,7 @@
37 37
     execute "a2dismod #{params[:name]}" do
38 38
       command "/usr/sbin/a2dismod #{params[:name]}"
39 39
       notifies :restart, resources(:service => "apache2")
40  
-      only_if do File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.load") end
  40
+      only_if do ::File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.load") end
41 41
     end
42 42
   end
43 43
 end
8  apache2/definitions/apache_site.rb
@@ -25,16 +25,16 @@
25 25
       command "/usr/sbin/a2ensite #{params[:name]}"
26 26
       notifies :restart, resources(:service => "apache2")
27 27
       not_if do 
28  
-        File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") or
29  
-          File.symlink?("#{node[:apache][:dir]}/sites-enabled/000-#{params[:name]}")
  28
+        ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") or
  29
+          ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/000-#{params[:name]}")
30 30
       end
31  
-      only_if do File.exists?("#{node[:apache][:dir]}/sites-available/#{params[:name]}") end
  31
+      only_if do ::File.exists?("#{node[:apache][:dir]}/sites-available/#{params[:name]}") end
32 32
     end
33 33
   else
34 34
     execute "a2dissite #{params[:name]}" do
35 35
       command "/usr/sbin/a2dissite #{params[:name]}"
36 36
       notifies :restart, resources(:service => "apache2")
37  
-      only_if do File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") end
  37
+      only_if do ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") end
38 38
     end
39 39
   end
40 40
 end
2  apache2/definitions/web_app.rb
@@ -38,7 +38,7 @@
38 38
       :application_name => application_name,
39 39
       :params => params
40 40
     )
41  
-    if File.exists?("#{node[:apache][:dir]}/sites-enabled/#{application_name}.conf")
  41
+    if ::File.exists?("#{node[:apache][:dir]}/sites-enabled/#{application_name}.conf")
42 42
       notifies :reload, resources(:service => "apache2"), :delayed
43 43
     end
44 44
   end
4  apache2/metadata.json
@@ -496,5 +496,5 @@
496 496
     "apache2::mod_ssl": "Apache module 'ssl' with config file, adds port 443 to listen_ports",
497 497
     "apache2::mod_status": "Apache module 'status' with config file"
498 498
   },
499  
-  "version": "0.99.1"
500  
-}
  499
+  "version": "0.99.2"
  500
+}
2  apache2/metadata.rb
@@ -3,7 +3,7 @@
3 3
 license           "Apache 2.0"
4 4
 description       "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions"
5 5
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6  
-version           "0.99.1"
  6
+version           "0.99.2"
7 7
 recipe            "apache2", "Main Apache configuration"
8 8
 recipe            "apache2::mod_alias", "Apache module 'alias' with config file"
9 9
 recipe            "apache2::mod_auth_basic", "Apache module 'auth_basic'"
4  apache2/recipes/mod_auth_openid.rb
@@ -55,9 +55,9 @@
55 55
   EOH
56 56
   case node[:platform]
57 57
   when "arch"
58  
-    not_if { File.exists?("/usr/lib/httpd/modules/mod_auth_openid.so") }
  58
+    not_if { ::File.exists?("/usr/lib/httpd/modules/mod_auth_openid.so") }
59 59
   else
60  
-    not_if { File.exists?("/usr/lib/apache2/modules/mod_auth_openid.so") }
  60
+    not_if { ::File.exists?("/usr/lib/apache2/modules/mod_auth_openid.so") }
61 61
   end
62 62
 end
63 63
 
4  application/metadata.json
@@ -41,7 +41,7 @@
41 41
   "platforms": {
42 42
   },
43 43
   "name": "application",
44  
-  "version": "0.8.0",
  44
+  "version": "0.8.1",
45 45
   "conflicting": {
46 46
   },
47 47
   "license": "Apache 2.0",
@@ -55,4 +55,4 @@
55 55
     "application::java_webapp": "Deploys a Java web application WAR specified in a data bag with the remote_file resource",
56 56
     "application::tomcat": "Sets up the deployed Java application with Tomcat as the servlet container"
57 57
   }
58  
-}
  58
+}
2  application/metadata.rb
@@ -3,7 +3,7 @@
3 3
 license          "Apache 2.0"
4 4
 description      "Deploys and configures a variety of applications defined from databag 'apps'"
5 5
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
6  
-version          "0.8.0"
  6
+version          "0.8.1"
7 7
 recipe           "application", "Loads application databags and selects recipes to use"
8 8
 recipe           "application::java_webapp", "Deploys a Java web application WAR specified in a data bag with the remote_file resource"
9 9
 recipe           "application::passenger-nginx", "Installs Ruby Enterprise with Passenger under Nginx"
4  application/recipes/rails.rb
@@ -87,11 +87,11 @@
87 87
 if app.has_key?("deploy_key")
88 88
   ruby_block "write_key" do
89 89
     block do
90  
-      f = File.open("#{app['deploy_to']}/id_deploy", "w")
  90
+      f = ::File.open("#{app['deploy_to']}/id_deploy", "w")
91 91
       f.print(app["deploy_key"])
92 92
       f.close
93 93
     end
94  
-    not_if do File.exists?("#{app['deploy_to']}/id_deploy"); end
  94
+    not_if do ::File.exists?("#{app['deploy_to']}/id_deploy"); end
95 95
   end
96 96
 
97 97
   file "#{app['deploy_to']}/id_deploy" do
4  application/recipes/rails_nginx_ree_passenger.rb
@@ -89,11 +89,11 @@
89 89
     if app.has_key?("deploy_key")
90 90
       ruby_block "write_key" do
91 91
         block do
92  
-          f = File.open("#{app['deploy_to']}/id_deploy", "w")
  92
+          f = ::File.open("#{app['deploy_to']}/id_deploy", "w")
93 93
           f.print(app["deploy_key"])
94 94
           f.close
95 95
         end
96  
-        not_if do File.exists?("#{app['deploy_to']}/id_deploy"); end
  96
+        not_if do ::File.exists?("#{app['deploy_to']}/id_deploy"); end
97 97
       end
98 98
 
99 99
       file "#{app['deploy_to']}/id_deploy" do
4  application/recipes/tomcat.rb
@@ -33,7 +33,7 @@
33 33
   notifies :restart, resources(:service => "tomcat")
34 34
 end
35 35
 
36  
-if File.symlink?(File.join(node['tomcat']['context_dir'], "ROOT.xml"))
  36
+if ::File.symlink?(::File.join(node['tomcat']['context_dir'], "ROOT.xml"))
37 37
   d = resources(:remote_file => app['id'])
38 38
   d.notifies :restart, resources(:service => "tomcat")
39  
-end
  39
+end
4  application/recipes/unicorn.rb
@@ -31,7 +31,7 @@
31 31
 
32 32
 unicorn_config "/etc/unicorn/#{app['id']}.rb" do
33 33
   listen({ node[:unicorn][:port] => node[:unicorn][:options] })
34  
-  working_directory File.join(app['deploy_to'], 'current')
  34
+  working_directory ::File.join(app['deploy_to'], 'current')
35 35
   worker_timeout node[:unicorn][:worker_timeout] 
36 36
   preload_app node[:unicorn][:preload_app] 
37 37
   worker_processes node[:unicorn][:worker_processes]
@@ -45,7 +45,7 @@
45 45
   run_restart false
46 46
 end
47 47
 
48  
-if File.exists?(File.join(app['deploy_to'], "current"))
  48
+if ::File.exists?(::File.join(app['deploy_to'], "current"))
49 49
   d = resources(:deploy => app['id'])
50 50
   d.restart_command do
51 51
     execute "/etc/init.d/#{app['id']} hup"
4  chef/metadata.json
@@ -84,5 +84,5 @@
84 84
     "chef::bootstrap_server": "Set up rubygem installed chef server",
85 85
     "chef::server_proxy": "Configures Apache2 proxy for API and WebUI"
86 86
   },
87  
-  "version": "0.22.0"
88  
-}
  87
+  "version": "0.22.1"
  88
+}
2  chef/metadata.rb
@@ -3,7 +3,7 @@
3 3
 license           "Apache 2.0"
4 4
 description       "Installs and configures Chef for chef-client and chef-server"
5 5
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
6  
-version           "0.22.0"
  6
+version           "0.22.1"
7 7
 recipe            "chef", "Default recipe is empty, use one of the other recipes."
8 8
 recipe            "chef::client", "Sets up a client to talk to a chef-server"
9 9
 recipe            "chef::client_service", "Sets up a client daemon to run periodically"
2  chef/recipes/client.rb
@@ -41,5 +41,5 @@
41 41
 end
42 42
 
43 43
 log "Add the chef::delete_validation recipe to the run list to remove the #{Chef::Config[:validation_key]}." do
44  
-  only_if { File.exists?(Chef::Config[:validation_key]) }
  44
+  only_if { ::File.exists?(Chef::Config[:validation_key]) }
45 45
 end
2  chef/recipes/server_proxy.rb
@@ -53,7 +53,7 @@
53 53
   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
54 54
   cat #{node[:chef][:server_fqdn]}.key #{node[:chef][:server_fqdn]}.crt > #{node[:chef][:server_fqdn]}.pem
55 55
   EOH
56  
-  not_if { File.exists?("/etc/chef/certificates/#{node[:chef][:server_fqdn]}.pem") }
  56
+  not_if { ::File.exists?("/etc/chef/certificates/#{node[:chef][:server_fqdn]}.pem") }
57 57
 end
58 58
 
59 59
 web_app "chef_server" do
4  glassfish/metadata.json
@@ -26,7 +26,7 @@
26 26
       ]
27 27
     },
28 28
     "license": "Apache 2.0",
29  
-    "version": "0.3.0",
  29
+    "version": "0.3.1",
30 30
     "maintainer": "Opscode, Inc.",
31 31
     "suggestions": {
32 32
     },
@@ -39,4 +39,4 @@
39 39
     },
40 40
     "description": "Installs/Configures Glassfish",
41 41
     "long_description": "= DESCRIPTION:\n\n= REQUIREMENTS:\n\n= ATTRIBUTES: \n\n= USAGE:\n\n"
42  
-  }
  42
+  }
2  glassfish/metadata.rb
@@ -3,7 +3,7 @@
3 3
 license          "Apache 2.0"
4 4
 description      "Installs/Configures Glassfish"
5 5
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6  
-version          "0.3.0"
  6
+version          "0.3.1"
7 7
 recipe            "glassfish", "Main Glassfish configuration"
8 8
 
9 9
 %w{redhat centos debian ubuntu}.each do |os|
2  glassfish/recipes/default.rb
@@ -52,7 +52,7 @@
52 52
 
53 53
 execute "install-glassfish" do
54 54
   command "/tmp/glassfish.sh -a #{answer_file} -s"
55  
-  creates File.join(node[:glassfish][:INSTALL_HOME],"uninstall.sh")
  55
+  creates ::File.join(node[:glassfish][:INSTALL_HOME],"uninstall.sh")
56 56
   user node[:glassfish][:systemuser]
57 57
   action :run
58 58
 end
4  munin/metadata.json
@@ -40,5 +40,5 @@
40 40
     "munin::client": "Instlls munin and configures a client by searching for the server, which should have a role named monitoring",
41 41
     "munin::server": "Installs munin and configures a server, node should have the role 'monitoring' so clients can find it"
42 42
   },
43  
-  "version": "0.10.0"
44  
-}
  43
+  "version": "0.10.1"
  44
+}
2  munin/metadata.rb
@@ -3,7 +3,7 @@
3 3
 license           "Apache 2.0"
4 4
 description       "Installs and configures munin"
5 5
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
6  
-version           "0.10.0"
  6
+version           "0.10.1"
7 7
 
8 8
 depends "apache2"
9 9
 supports "arch"
2  munin/recipes/server.rb
@@ -68,7 +68,7 @@
68 68
   source "apache2.conf.erb"
69 69
   mode 0644
70 70
   variables :public_domain => public_domain
71  
-  if File.symlink?("#{node[:apache][:dir]}/sites-enabled/munin.conf")
  71
+  if ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/munin.conf")
72 72
     notifies :reload, resources(:service => "apache2")
73 73
   end
74 74
 end
4  nagios/metadata.json
@@ -37,5 +37,5 @@
37 37
     "nagios::client": "Installs and configures a nagios client with nrpe",
38 38
     "nagios::server": "Installs and configures a nagios server"
39 39
   },
40  
-  "version": "0.4.3"
41  
-}
  40
+  "version": "0.4.4"
  41
+}
2  nagios/metadata.rb
@@ -3,7 +3,7 @@
3 3
 license           "Apache 2.0"
4 4
 description       "Installs and configures nagios"
5 5
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6  
-version           "0.4.3"
  6
+version           "0.4.4"
7 7
 
8 8
 recipe "nagios", "Includes the client recipe."
9 9
 recipe "nagios::client", "Installs and configures a nagios client with nrpe"
2  nagios/recipes/server.rb
@@ -117,7 +117,7 @@
117 117
   source "apache2.conf.erb"
118 118
   mode 0644
119 119
   variables :public_domain => public_domain
120  
-  if File.symlink?("#{node[:apache][:dir]}/sites-enabled/nagios3.conf")
  120
+  if ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/nagios3.conf")
121 121
     notifies :reload, resources(:service => "apache2")
122 122
   end
123 123
 end
4  nginx/definitions/nginx_site.rb
@@ -23,13 +23,13 @@
23 23
     execute "nxensite #{params[:name]}" do
24 24
       command "/usr/sbin/nxensite #{params[:name]}"
25 25
       notifies :restart, resources(:service => "nginx")
26  
-      not_if do File.symlink?("#{node[:nginx][:dir]}/sites-enabled/#{params[:name]}") end
  26
+      not_if do ::File.symlink?("#{node[:nginx][:dir]}/sites-enabled/#{params[:name]}") end
27 27
     end
28 28
   else
29 29
     execute "nxdissite #{params[:name]}" do
30 30
       command "/usr/sbin/nxdissite #{params[:name]}"
31 31
       notifies :restart, resources(:service => "nginx")
32  
-      only_if do File.symlink?("#{node[:nginx][:dir]}/sites-enabled/#{params[:name]}") end
  32
+      only_if do ::File.symlink?("#{node[:nginx][:dir]}/sites-enabled/#{params[:name]}") end
33 33
     end
34 34
   end
35 35
 end
4  nginx/metadata.json
@@ -234,7 +234,7 @@
234 234
 
235 235
       ]
236 236
     },
237  
-    "version": "0.14.3",
  237
+    "version": "0.14.4",
238 238
     "groupings": {
239 239
     },
240 240
     "long_description": "",
@@ -252,4 +252,4 @@
252 252
     },
253 253
     "conflicting": {
254 254
     }
255  
-  }
  255
+  }
2  nginx/metadata.rb
@@ -2,7 +2,7 @@
2 2
 maintainer_email  "cookbooks@opscode.com"
3 3
 license           "Apache 2.0"
4 4
 description       "Installs and configures nginx"
5  
-version           "0.14.3"
  5
+version           "0.14.4"
6 6
 
7 7
 recipe "nginx", "Installs nginx package and sets up configuration with Debian apache style with sites-enabled/sites-available"
8 8
 recipe "nginx::source", "Installs nginx from source and sets up configuration with Debian apache style with sites-enabled/sites-available"
4  rabbitmq_chef/metadata.json
@@ -32,7 +32,7 @@
32 32
       ]
33 33
     },
34 34
     "license": "Apache 2.0",
35  
-    "version": "0.10.3",
  35
+    "version": "0.10.4",
36 36
     "maintainer": "Opscode, Inc.",
37 37
     "suggestions": {
38 38
     },
@@ -45,4 +45,4 @@
45 45
     },
46 46
     "description": "Installs the RabbitMQ AMQP Broker for use on a Chef Server.",
47 47
     "long_description": ""
48  
-  }
  48
+  }
2  rabbitmq_chef/metadata.rb
@@ -2,7 +2,7 @@
2 2
 maintainer_email  "cookbooks@opscode.com"
3 3
 license           "Apache 2.0"
4 4
 description       "Installs the RabbitMQ AMQP Broker for use on a Chef Server."
5  
-version           "0.10.3"
  5
+version           "0.10.4"
6 6
 
7 7
 recipe "rabbitmq_chef", "Install and configure rabbitmq specifically for a Chef Server"
8 8
 
2  rabbitmq_chef/recipes/default.rb
@@ -26,7 +26,7 @@ def debian_before_squeeze?
26 26
 if (platform?("ubuntu") && node.platform_version.to_f <= 9.10) || debian_before_squeeze?
27 27
   include_recipe("erlang")
28 28
 
29  
-  rabbitmq_dpkg_path = File.join(Chef::Config[:file_cache_path], "/", "rabbitmq-server_1.7.2-1_all.deb")
  29
+  rabbitmq_dpkg_path = ::File.join(Chef::Config[:file_cache_path], "/", "rabbitmq-server_1.7.2-1_all.deb")
30 30
 
31 31
   remote_file(rabbitmq_dpkg_path) do
32 32
     checksum "ea2bbbb41f6d539884498bbdb5c7d3984643127dbdad5e9f7c28ec9df76b1355"
4  redmine/metadata.json
@@ -35,7 +35,7 @@
35 35
       ]
36 36
     },
37 37
     "license": "Apache 2.0",
38  
-    "version": "0.10.2",
  38
+    "version": "0.10.3",
39 39
     "maintainer": "Opscode, Inc.",
40 40
     "suggestions": {
41 41
     },
@@ -48,4 +48,4 @@
48 48
     },
49 49
     "description": "Installs and configures redmine as a Rails app in passenger+apache2",
50 50
     "long_description": ""
51  
-  }
  51
+  }
2  redmine/metadata.rb
@@ -2,7 +2,7 @@
2 2
 maintainer_email  "cookbooks@opscode.com"
3 3
 license           "Apache 2.0"
4 4
 description       "Installs and configures redmine as a Rails app in passenger+apache2"
5  
-version           "0.10.2"
  5
+version           "0.10.3"
6 6
 
7 7
 recipe "redmine", "Installs and configures redmine under passenger + apache2"
8 8
 
4  redmine/recipes/default.rb
@@ -31,7 +31,7 @@
31 31
     tar xf redmine-#{node[:redmine][:version]}.tar.gz
32 32
     chown -R #{node[:apache][:user]} redmine-#{node[:redmine][:version]}
33 33
   EOH
34  
-  not_if { File.exists?("/srv/redmine-#{node[:redmine][:version]}/Rakefile") }
  34
+  not_if { ::File.exists?("/srv/redmine-#{node[:redmine][:version]}/Rakefile") }
35 35
 end
36 36
 
37 37
 link "/srv/redmine" do
@@ -62,7 +62,7 @@
62 62
 execute "rake db:migrate RAILS_ENV='production'" do
63 63
   user node[:apache][:user]
64 64
   cwd "/srv/redmine-#{node[:redmine][:version]}"
65  
-  not_if { File.exists?("/srv/redmine-#{node[:redmine][:version]}/db/schema.rb") }
  65
+  not_if { ::File.exists?("/srv/redmine-#{node[:redmine][:version]}/db/schema.rb") }
66 66
 end
67 67
 
68 68
 web_app "redmine" do
4  rsyslog/metadata.json
@@ -92,5 +92,5 @@
92 92
     "rsyslog::client": "Sets up a client to log to a remote rsyslog server",
93 93
     "rsyslog::server": "Sets up an rsyslog server"
94 94
   },
95  
-  "version": "0.9.4"
96  
-}
  95
+  "version": "0.9.5"
  96
+}
2  rsyslog/metadata.rb
@@ -3,7 +3,7 @@
3 3
 license           "Apache 2.0"
4 4
 description       "Installs and configures rsyslog"
5 5
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6  
-version           "0.9.4"
  6
+version           "0.9.5"
7 7
 
8 8
 recipe            "rsyslog", "Installs rsyslog"
9 9
 recipe            "rsyslog::client", "Sets up a client to log to a remote rsyslog server"
2  rsyslog/recipes/client.rb
@@ -38,6 +38,6 @@
38 38
   file "/etc/rsyslog.d/server.conf" do
39 39
     action :delete
40 40
     notifies :reload, resources(:service => "rsyslog"), :delayed
41  
-    only_if do File.exists?("/etc/rsyslog.d/server.conf") end
  41
+    only_if do ::File.exists?("/etc/rsyslog.d/server.conf") end
42 42
   end
43 43
 end
2  rsyslog/recipes/server.rb
@@ -42,7 +42,7 @@
42 42
   action :delete
43 43
   backup false
44 44
   notifies :reload, resources(:service => "rsyslog"), :delayed
45  
-  only_if do File.exists?("/etc/rsyslog.d/remote.conf") end
  45
+  only_if do ::File.exists?("/etc/rsyslog.d/remote.conf") end
46 46
 end
47 47
 
48 48
 template "/etc/cron.d/rsyslog_gz" do
4  runit/metadata.json
@@ -104,5 +104,5 @@
104 104
   "recipes": {
105 105
     "runit": "Installs and configures runit"
106 106
   },
107  
-  "version": "0.14.1"
108  
-}
  107
+  "version": "0.14.2"
  108
+}
2  runit/metadata.rb
@@ -2,7 +2,7 @@
2 2
 maintainer_email  "cookbooks@opscode.com"
3 3
 license           "Apache 2.0"
4 4
 description       "Installs runit and provides runit_service definition"
5  
-version           "0.14.1"
  5
+version           "0.14.2"
6 6
 
7 7
 recipe "runit", "Installs and configures runit"
8 8
 
2  runit/recipes/default.rb
@@ -66,7 +66,7 @@
66 66
       source "runsvdir"
67 67
       mode 0644
68 68
       notifies :run, resources(:execute => "start-runsvdir"), :immediately
69  
-      only_if do File.directory?("/etc/event.d") end
  69
+      only_if do ::File.directory?("/etc/event.d") end
70 70
     end
71 71
   end
72 72
 end
4  teamspeak/metadata.json
@@ -20,7 +20,7 @@
20 20
       ]
21 21
     },
22 22
     "license": "Apache 2.0",
23  
-    "version": "0.8.0",
  23
+    "version": "0.8.1",
24 24
     "providing": {
25 25
     },
26 26
     "recipes": {
@@ -33,4 +33,4 @@
33 33
     "groupings": {
34 34
     },
35 35
     "long_description": ""
36  
-  }
  36
+  }
2  teamspeak/metadata.rb
@@ -2,7 +2,7 @@
2 2
 maintainer_email  "cookbooks@opscode.com"
3 3
 license           "Apache 2.0"
4 4
 description       "Installs teamspeak and enables service"
5  
-version           "0.8"
  5
+version           "0.8.1"
6 6
 depends           "php"
7 7
 supports "ubuntu"
8 8
 recipe "teamspeak", "Installs and configures teamspeak2"
2  teamspeak/recipes/default.rb
@@ -49,7 +49,7 @@
49 49
 wget http://softlayer.dl.sourceforge.net/sourceforge/tsdisplay/TeamspeakDisplay-PR3.zip
50 50
 unzip TeamSpeakDisplay-PR3.zip  
51 51
 EOH
52  
-  not_if { File.exists?("/srv/www/tsdisplay/TeamspeakDisplay-PR3.zip") }
  52
+  not_if { ::File.exists?("/srv/www/tsdisplay/TeamspeakDisplay-PR3.zip") }
53 53
 end
54 54
 
55 55
 template "/srv/www/tsdisplay/demo.php" do
4  tomcat6/metadata.json
@@ -46,5 +46,5 @@
46 46
   "recipes": {
47 47
     "tomcat6": "Main Tomcat 6 configuration"
48 48
   },
49  
-  "version": "0.5.3"
50  
-}
  49
+  "version": "0.5.4"
  50
+}
2  tomcat6/metadata.rb
@@ -3,7 +3,7 @@
3 3
 license           "Apache 2.0"
4 4
 description       "Installs and configures all aspects of tomcat6 using custom local installation"
5 5
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6  
-version           "0.5.3"
  6
+version           "0.5.4"
7 7
 recipe            "tomcat6", "Main Tomcat 6 configuration"
8 8
 
9 9
 %w{redhat centos}.each do |os|
16  tomcat6/recipes/default.rb
@@ -45,7 +45,7 @@
45 45
 end
46 46
 
47 47
 [:temp,:logs,:webapps,:conf].each do |dir|
48  
-  link File.join(node[:tomcat6][:home],dir.to_s) do
  48
+  link ::File.join(node[:tomcat6][:home],dir.to_s) do
49 49
     to node[:tomcat6][dir] # use values from attributes
50 50
   end
51 51
 end
@@ -67,7 +67,7 @@
67 67
   tomcat_version_name_tgz = "#{tomcat_version_name}.tar.gz"
68 68
   user "root"
69 69
   cwd usr_share_dir
70  
-  not_if do File.exists?(File.join(usr_share_dir,tomcat_version_name)) end
  70
+  not_if do ::File.exists?(::File.join(usr_share_dir,tomcat_version_name)) end
71 71
   code <<-EOH
72 72
   wget http://archive.apache.org/dist/tomcat/tomcat-6/v#{node[:tomcat6][:version]}/bin/#{tomcat_version_name_tgz}
73 73
   tar -zxf #{tomcat_version_name_tgz}
@@ -79,21 +79,21 @@
79 79
 # just to have it here, may be overriden through own configuration
80 80
 bash "install_tomcat6_etc" do
81 81
   user node[:tomcat6][:user]
82  
-  not_if do File.exists?(File.join(node[:tomcat6][:conf],"tomcat6.conf")) end
  82
+  not_if do ::File.exists?(::File.join(node[:tomcat6][:conf],"tomcat6.conf")) end
83 83
   cwd node[:tomcat6][:conf]
84 84
   code <<-EOH
85 85
   cp -r #{usr_share_dir}/apache-tomcat-#{node[:tomcat6][:version]}/conf/* .
86 86
   EOH
87 87
 end
88 88
 
89  
-link File.join(node[:tomcat6][:home],"lib") do
90  
-  to File.join(usr_share_dir,"apache-tomcat-#{node[:tomcat6][:version]}","lib")
  89
+link ::File.join(node[:tomcat6][:home],"lib") do
  90
+  to ::File.join(usr_share_dir,"apache-tomcat-#{node[:tomcat6][:version]}","lib")
91 91
   notifies :run, resources(:bash => "update_manager"), :immediately
92 92
   notifies :restart, resources(:service => "tomcat6"), :delayed
93 93
 end
94 94
 
95  
-link File.join(node[:tomcat6][:home],"bin") do
96  
-  to File.join(usr_share_dir,"apache-tomcat-#{node[:tomcat6][:version]}","bin")
  95
+link ::File.join(node[:tomcat6][:home],"bin") do
  96
+  to ::File.join(usr_share_dir,"apache-tomcat-#{node[:tomcat6][:version]}","bin")
97 97
   notifies :restart, resources(:service => "tomcat6"), :delayed
98 98
 end
99 99
 
@@ -168,7 +168,7 @@
168 168
   group "root"
169 169
 end
170 170
 
171  
-cookbook_file File.join(node[:tomcat6][:dir],"logging.properties") do
  171
+cookbook_file ::File.join(node[:tomcat6][:dir],"logging.properties") do
172 172
   source "logging.properties"
173 173
   mode 0644
174 174
   owner "root"
2  trac/metadata.json
@@ -5,7 +5,7 @@
5 5
   "replacing": {
6 6
 
7 7
   },
8  
-  "version": "0.1.0",
  8
+  "version": "0.1.1",
9 9
   "platforms": {
10 10
 
11 11
   },
2  trac/metadata.rb
@@ -3,5 +3,5 @@
3 3
 license          "Apache 2.0"
4 4
 description      "Installs/Configures Trac"
5 5
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
6  
-version          "0.1"
  6
+version          "0.1.1"
7 7
 depends          "apache2"
27  trac/recipes/default.rb
@@ -7,9 +7,9 @@
7 7
 # Licensed under the Apache License, Version 2.0 (the "License");
8 8
 # you may not use this file except in compliance with the License.
9 9
 # You may obtain a copy of the License at
10  
-# 
  10
+#
11 11
 #     http://www.apache.org/licenses/LICENSE-2.0
12  
-# 
  12
+#
13 13
 # Unless required by applicable law or agreed to in writing, software
14 14
 # distributed under the License is distributed on an "AS IS" BASIS,
15 15
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,7 @@
46 46
   group "root"
47 47
   mode 0755
48 48
   variables(
49  
-    :trac_environment => "#{node[:trac][:basedir]}/environment" 
  49
+    :trac_environment => "#{node[:trac][:basedir]}/environment"
50 50
   )
51 51
 end
52 52
 
@@ -72,13 +72,13 @@
72 72
   group "www-data"
73 73
   mode 0775
74 74
   variables(
75  
-    :trac_project_desc => node[:trac][:project_description], 
76  
-    :trac_project_name => node[:trac][:project_name], 
77  
-    :trac_mainnav => node[:trac][:mainnav], 
  75
+    :trac_project_desc => node[:trac][:project_description],
  76
+    :trac_project_name => node[:trac][:project_name],
  77
+    :trac_mainnav => node[:trac][:mainnav],
78 78
     :trac_metanav => node[:trac][:metanav],
79  
-    :trac_url => node[:trac][:vhosts].first, 
80  
-    :trac_svn_branches => node[:trac][:svn_branches], 
81  
-    :trac_svn_tags => node[:trac][:svn_tags], 
  79
+    :trac_url => node[:trac][:vhosts].first,
  80
+    :trac_svn_branches => node[:trac][:svn_branches],
  81
+    :trac_svn_tags => node[:trac][:svn_tags],
82 82
     :trac_svn_repo => node[:trac][:svn_dir]
83 83
   )
84 84
 end
@@ -90,9 +90,9 @@
90 90
   group "root"
91 91
   mode 0644
92 92
   variables(
93  
-    :trac_dir => node[:trac][:basedir], 
94  
-    :trac_project_name => node[:trac][:project_name], 
95  
-    :trac_required_groups => node[:trac][:required_groups], 
  93
+    :trac_dir => node[:trac][:basedir],
  94
+    :trac_project_name => node[:trac][:project_name],
  95
+    :trac_required_groups => node[:trac][:required_groups],
96 96
     :trac_vhosts => node[:trac][:vhosts]
97 97
   )
98 98
 end
@@ -108,6 +108,5 @@
108 108
   minute "0"
109 109
   command "trac-admin #{node[:trac][:basedir]}/environment resync"
110 110
   user "www-data"
111  
-  only_if do File.exists?("#{node[:trac][:basedir]}/environment") end
  111
+  only_if do ::File.exists?("#{node[:trac][:basedir]}/environment") end
112 112
 end
113  
-

0 notes on commit 8c7b0c5

Please sign in to comment.
Something went wrong with that request. Please try again.