From dbcb359d33578b2cd2c119a82eda9991d49324a3 Mon Sep 17 00:00:00 2001
From: Josh Behrends <josh.behrends@iovation.com>
Date: Fri, 4 Sep 2015 10:58:53 -0700
Subject: [PATCH] updated systemd-override to support fedora and CentOS paths
 for systemd

---
 spec/unit/classes/server/config_spec.rb | 52 +++++++++++++++++++++++--
 templates/systemd-override.erb          |  4 ++
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/spec/unit/classes/server/config_spec.rb b/spec/unit/classes/server/config_spec.rb
index 4e77c7e..c03032d 100644
--- a/spec/unit/classes/server/config_spec.rb
+++ b/spec/unit/classes/server/config_spec.rb
@@ -25,7 +25,7 @@ describe 'postgresql::server::config', :type => :class do
         :group => 'root',
       })
       is_expected.to contain_file('systemd-override') \
-        .with_content(/postgresql.service/)
+        .with_content(/.include \/usr\/lib\/systemd\/system\/postgresql.service/)
     end
 
     describe 'with manage_package_repo => true and a version' do
@@ -47,9 +47,55 @@ describe 'postgresql::server::config', :type => :class do
           :group => 'root',
         })
         is_expected.to contain_file('systemd-override') \
-          .with_content(/postgresql-9.4.service/)
+          .with_content(/.include \/usr\/lib\/systemd\/system\/postgresql-9.4.service/)
+      end
+    end
+  end
+
+  describe 'on Fedora 21' do
+    let :facts do
+      {
+        :osfamily => 'RedHat',
+        :operatingsystem => 'Fedora',
+        :operatingsystemrelease => '21',
+        :concat_basedir => tmpfilename('server'),
+        :kernel => 'Linux',
+        :id => 'root',
+        :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    it 'should have the correct systemd-override file' do
+      is_expected.to contain_file('systemd-override').with ({
+        :ensure => 'present',
+        :path => '/etc/systemd/system/postgresql.service',
+        :owner => 'root',
+        :group => 'root',
+      })
+      is_expected.to contain_file('systemd-override') \
+        .with_content(/.include \/lib\/systemd\/system\/postgresql.service/)
+    end
+
+    describe 'with manage_package_repo => true and a version' do
+      let (:pre_condition) do
+        <<-EOS
+          class { 'postgresql::globals':
+            manage_package_repo => true,
+            version => '9.4',
+          }->
+          class { 'postgresql::server': }
+        EOS
+      end
+
+      it 'should have the correct systemd-override file' do
+        is_expected.to contain_file('systemd-override').with ({
+          :ensure => 'present',
+          :path => '/etc/systemd/system/postgresql-9.4.service',
+          :owner => 'root',
+          :group => 'root',
+        })
+        is_expected.to contain_file('systemd-override') \
+          .with_content(/.include \/lib\/systemd\/system\/postgresql-9.4.service/)
       end
     end
   end
 end
-
diff --git a/templates/systemd-override.erb b/templates/systemd-override.erb
index 6e49736..eb4f787 100644
--- a/templates/systemd-override.erb
+++ b/templates/systemd-override.erb
@@ -1,4 +1,8 @@
+<%- if scope.lookupvar('::operatingsystem') == 'Fedora' -%>
 .include /lib/systemd/system/<%= @service_name %>.service
+<% else -%>
+.include /usr/lib/systemd/system/<%= @service_name %>.service
+<% end -%>
 [Service]
 Environment=PGPORT=<%= @port %>
 Environment=PGDATA=<%= @datadir %>