Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
View
6 apache2/definitions/apache_module.rb
@@ -38,9 +38,9 @@
execute "a2enmod #{params[:name]}" do
command "/usr/sbin/a2enmod #{params[:name]}"
notifies :restart, resources(:service => "apache2")
- not_if do (File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.load") and
- ((File.exists?("#{node[:apache][:dir]}/mods-available/#{params[:name]}.conf"))?
- (File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.conf")):(true)))
+ not_if do (::File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.load") and
+ ((::File.exists?("#{node[:apache][:dir]}/mods-available/#{params[:name]}.conf"))?
+ (::File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.conf")):(true)))
end
end
else
View
4 apt/recipes/default.rb
@@ -42,8 +42,8 @@
command "apt-get update"
ignore_failure true
only_if do
- File.exists?('/var/lib/apt/periodic/update-success-stamp') &&
- File.mtime('/var/lib/apt/periodic/update-success-stamp') < Time.now - 86400
+ ::File.exists?('/var/lib/apt/periodic/update-success-stamp') &&
+ ::File.mtime('/var/lib/apt/periodic/update-success-stamp') < Time.now - 86400
end
end
View
1  default_vhost
View
2  hostname/recipes/default.rb
@@ -15,7 +15,7 @@
bash "reload_hostname" do
user "root"
code "hostname -F /etc/hostname"
- notifies :restart, "service[chef-client]"
+ # notifies :restart, "service[chef-client]" # No good with chef-solo
action :nothing
end
View
1  kimono
View
1  mashd_cc
View
1  shorty
View
1  vitc

No commit comments for this range

Something went wrong with that request. Please try again.