adding .conf to file checks

sous-chefs · Jun 23, 2014 · 37629fb · 37629fb
1 parent 7940973
commit 37629fb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/definitions/apache_site.rb b/definitions/apache_site.rb
@@ -25,18 +25,18 @@
       command "/usr/sbin/a2ensite #{params[:name]}"
       notifies :restart, 'service[apache2]'
       not_if do
-        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/#{params[:name]}") ||
-        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/000-#{params[:name]}")
+        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/#{params[:name]}.conf") ||
+        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/000-#{params[:name]}.conf")
       end
-      only_if { ::File.exists?("#{node['apache']['dir']}/sites-available/#{params[:name]}") }
+      only_if { ::File.exist?("#{node['apache']['dir']}/sites-available/#{params[:name]}.conf") }
     end
   else
     execute "a2dissite #{params[:name]}" do
       command "/usr/sbin/a2dissite #{params[:name]}"
       notifies :restart, 'service[apache2]'
       only_if do
-        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/#{params[:name]}") ||
-        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/000-#{params[:name]}")
+        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/#{params[:name]}.conf") ||
+        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/000-#{params[:name]}.conf")
       end
     end
   end