Merge pull request puppetlabs#488 from apenney/fix-accept

Fix port changing.

Author: Ashley Penney

CHANGELOG.md

@@ -1,3 +1,86 @@
+##2014-09-03 - Supported Release 4.0.0
+###Summary
+
+This release removes the uninstall ability from the module, removes the firewall
+management, overhauls all of the acceptance testing, as well as adds better
+support for SuSE and Fedora.
+
+###Backwards Incompatible changes.
+
+- Uninstall code removal.
+- Firewall management for Postgres.
+- Set manage_pg_ident_conf to true.
+
+####Uninstallation removal
+
+We rely heavily on the ability to uninstall and reinstall postgres throughout
+our testing code, testing features like "can I move from the distribution
+packages to the upstream packages through the module" and over time we've
+learnt that the uninstall code simply doesn't work a lot of the time.  It
+leaves traces of postgres behind or fails to remove certain packages on Ubuntu,
+and generally causes bits to be left on your system that you didn't expect.
+
+When we then reinstall things fail because it's not a true clean slate, and
+this causes us enormous problems during test.  We've spent weeks and months
+working on these tests and they simply don't hold up well across the full range
+of PE platforms.
+
+Due to all these problems we've decided to take a stance on uninstalling in
+general.  We feel that in 2014 it's completely reasonable and normal to have a
+good provisioning pipeline combined with your configuration management and the
+"correct" way to uninstall a fully installed service like postgresql is to
+simply reprovision the server without it in the first place.  As a general rule
+this is how I personally like to work and I think is a good practice.
+
+####I'm not OK with this!
+
+We understand that there are environments and situations in which it's not easy
+to do that.  What if you accidently deployed Postgres on 100,000 nodes?  In the
+future we're going to take a look at building some example 'profiles' to be
+found under examples/ within this module that can uninstall postgres on popular
+platforms.  These can be modified and used in your specific case to uninstall
+postgresql.  They will be much more brute force and reliant on deleting entire
+directories and require you to do more work up front in specifying where things
+are installed but we think it'll prove to be a much cleaner mechanism for this
+kind of thing rather than trying to weave it into the main module logic itself.
+
+####Features
+- Removal of uninstall.
+- Removal of firewall management.
+- Tests ported to rspec3.
+- Acceptance tests rewritten.
+- Add a defined type for creating database schemas.
+- Add a pg_ident_rule defined type.
+- Set manage_pg_ident_conf to true.
+- Manage pg_ident.conf by default.
+- Improve selinux support for tablespace.
+- Remove deprecation warnings.
+- Support changing PGDATA on RedHat.
+- Add SLES 11 support.
+
+####Bugfixes
+- Link pg_config binary into /usr/bin.
+- Fix fedora support by using systemd.
+- Initdb should create xlogdir if set.
+
+##2014-08-27 - Supported Release 3.4.3
+###Summary
+
+This release fixes Ubuntu 10.04 with Facter 2.2.
+
+####Features
+####Bugfixes
+- Use a regular expression to match the major OS version on Ubuntu.
+
+##2014-07-31 - Supported Release 3.4.2
+###Summary
+
+This release fixes recent Fedora versions.
+
+####Features
+####Bugfixes
+- Fix Fedora.
+
 ##2014-07-15 - Supported Release 3.4.1
 ###Summary
 

manifests/params.pp

@@ -112,7 +112,7 @@
         $service_name = $::operatingsystem ? {
           'Debian' => pick($service_name, 'postgresql'),
           'Ubuntu' => $::lsbmajdistrelease ? {
-            '10' => pick($service_name, "postgresql-${version}"),
+            /^10/ => pick($service_name, "postgresql-${version}"),
             default => pick($service_name, 'postgresql'),
           },
           default => undef

manifests/server/config.pp

@@ -114,7 +114,7 @@
     concat { $pg_ident_conf_path:
       owner  => $user,
       group  => $group,
-      force   => true, # do not crash if there is no pg_ident_rules
+      force  => true, # do not crash if there is no pg_ident_rules
       mode   => '0640',
       warn   => true,
       notify => Class['postgresql::server::reload'],

manifests/server/config_entry.pp

@@ -30,9 +30,23 @@
     }
   }
 
-  # We have to handle ports in a weird and special way.  On Redhat we either
-  # have to create a systemd override for the port or update the sysconfig
-  # file.
+  # We have to handle ports in a weird and special way.  On early Debian and
+  # Ubuntu we have to ensure we stop the service completely. On Redhat we
+  # either have to create a systemd override for the port or update the
+  # sysconfig file.  
+  if $::operatingsystem == 'Debian' or $::operatingsystem == 'Ubuntu' {
+    if $::operatingsystemrelease =~ /^6/ or $::operatingsystemrelease =~ /^10\.04/ {
+      if $name == 'port' {
+        exec { 'postgresql_stop':
+          command => "service ${::postgresql::server::service_name} stop",
+          onlyif  => "service ${::postgresql::server::service_name} status",
+          unless  => "grep 'port = ${value}' ${::postgresql::server::postgresql_conf_path}",
+          path    => '/usr/sbin:/sbin:/bin:/usr/bin:/usr/local/bin',
+          before  => Postgresql_conf[$name],
+        }
+      }
+    }
+  }
   if $::osfamily == 'RedHat' {
     if $::operatingsystemrelease =~ /^7/ or $::operatingsystem == 'Fedora' {
       if $name == 'port' {

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-postgresql",
-  "version": "3.4.1",
+  "version": "4.0.0",
   "author": "Inkling/Puppet Labs",
   "summary": "PostgreSQL defined resource types",
   "license": "ASL 2.0",