Merge remote-tracking branch 'blewa/issue_318_datadir'

Author: Jonathan Owens

manifests/server/config.pp

@@ -97,6 +97,16 @@
     postgresql::server::config_entry { 'listen_addresses':
       value => $listen_addresses,
     }
+
+    # When installing pgrpms packages, write a /etc/sysconfig/pgsql file
+    if (($::osfamily == 'RedHat' or $::osfamily == 'Linux') and $postgresql::globals::manage_package_repo == true ) {
+      $version_parts = split($version, '[.]')
+      # File will be something like /etc/sysconfig/pgsql/postgresql-9.3
+      file { "etc-sysconfig-pgsql":
+        path    => "/etc/sysconfig/pgsql/postgresql-${version_parts[0]}.${version_parts[1]}",
+        content => template('postgrseql/etc-sysconfig-pgsql.erb'),
+      }
+    }
   } else {
     file { $pg_hba_conf_path:
       ensure => absent,

spec/unit/classes/server_spec.rb

@@ -90,4 +90,21 @@
       should contain_exec('postgresql_initdb')
     end
   end
+
+  describe '/etc/sysconfig/pgsql on RHEL based systems' do
+    let(:params) do
+      {
+        :manage_package_repo => true,
+        :operatingsystem => 'CentOS',
+        :operatingsystemmajrelease => '6',
+        :operatingsystemrelease => '6.5',
+        :osfamily => 'RedHat',
+        :version => '9.3.2-1',
+      }
+
+      it 'should include the proper sysconfig file' do
+        should contain_file('/etc/sysconfig/pgsql/postgresql-9.3')
+      end
+    end
+  end
 end

templates/etc-sysconfig-pgsql.erb

@@ -0,0 +1 @@
+PGDATA=<%= @datadir %>