Merge pull request RiotGamesCookbooks#3 from Azrael808/centos7_support

Adding CentOS 7 Support

providers/instance.rb

@@ -122,8 +122,14 @@ def whyrun_supported?
     service "dirsrv-#{new_resource.instance}" do
       service_name "dirsrv"
       supports :status => true
-      start_command "service dirsrv start #{new_resource.instance}"
-      status_command "service dirsrv status #{new_resource.instance}"
+      if node[:platform_family] == 'rhel' && node[:platform_version].to_i >= 7
+        start_command "systemctl start dirsrv\\@#{new_resource.instance}"
+        restart_command "systemctl restart dirsrv\\@#{new_resource.instance}"
+        status_command "systemctl status dirsrv\\@#{new_resource.instance}"
+      else
+        start_command "service dirsrv start #{new_resource.instance}"
+        status_command "service dirsrv status #{new_resource.instance}"
+      end
       action :start
     end
 
@@ -145,8 +151,13 @@ def whyrun_supported?
     service "dirsrv-#{new_resource.instance}" do
       service_name "dirsrv"
       supports :status => true
-      stop_command "service dirsrv stop #{new_resource.instance}"
-      status_command "service dirsrv status #{new_resource.instance}"
+      if node[:platform_family] == 'rhel' && node[:platform_version].to_i >= 7
+        stop_command "systemctl stop dirsrv\\@#{new_resource.instance}"
+        status_command "systemctl status dirsrv\\@#{new_resource.instance}"
+      else
+        stop_command "service dirsrv stop #{new_resource.instance}"
+        status_command "service dirsrv status #{new_resource.instance}"
+      end
       action :stop
     end
 
@@ -164,8 +175,13 @@ def whyrun_supported?
     service "dirsrv-#{new_resource.instance}" do
       service_name "dirsrv"
       supports :status => true, :restart => true
-      restart_command "service dirsrv restart #{new_resource.instance}"
-      status_command "service dirsrv status #{new_resource.instance}"
+      if node[:platform_family] == 'rhel' && node[:platform_version].to_i >= 7
+        restart_command "systemctl restart dirsrv\\@#{new_resource.instance}"
+        status_command "systemctl status dirsrv\\@#{new_resource.instance}"
+      else
+        restart_command "service dirsrv restart #{new_resource.instance}"
+        status_command "service dirsrv status #{new_resource.instance}"
+      end
       action :restart
     end
 

recipes/default.rb

@@ -23,8 +23,8 @@
 if node[:dirsrv][:use_yum_epel] and platform_family?("rhel")
   yum_repository 'epel' do
     description 'Extra Packages for Enterprise Linux'
-    mirrorlist 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch'
-    gpgkey 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
+    mirrorlist "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{node[:platform_version].split(".").first}&arch=$basearch"
+    gpgkey "http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node[:platform_version].split(".").first}"
     action :create
   end
 end