service apache2 -> apache2 or httpd

Blufe · Sep 22, 2014 · 6275e2e · 6275e2e
1 parent 9141d62
commit 6275e2e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/providers/apache_module.rb b/providers/apache_module.rb
@@ -37,6 +37,10 @@ def whyrun_supported?
 
   if module_path && ::File.exists?(module_path)
     service "apache2" do
+      service_name value_for_platform(
+        ['centos','redhat','fedora','amazon'] => {'default' => 'httpd'},
+        'default' => 'apache2'
+      )
       action :nothing
     end
 

diff --git a/recipes/phps.rb b/recipes/phps.rb
@@ -23,6 +23,5 @@
 end
 
 if node[:phpenv][:apache_module]
-  include_recipe 'apache2'
   phpenv_apache_module node[:phpenv][:apache_module]
 end