Merge pull request #454 from apenney/merge-from-34

Merge 3.4.x changes into master.

CHANGELOG.md

@@ -1,3 +1,31 @@
+##2014-07-15 - Supported Release 3.4.1
+###Summary
+
+This release merely updates metadata.json so the module can be uninstalled and
+upgraded via the puppet module command.
+
+##2014-04-14 - Supported Release 3.4.0
+###Summary
+
+This feature rolls up several important features, the biggest being PostGIS
+handling and allowing `port` to be set on postgresql::server in order to
+change the port that Postgres listens on.  We've added support for RHEL7
+and Ubuntu 14.04, as well as allowing you to manage the service via
+`service_ensure` finally.
+
+####Features
+- Added `perl_package_name` for installing bindings.
+- Added `service_ensure` for allowing control of services.
+- Added `postgis_version` and postgis class for installing postgis.
+- Added `port` for selecting the port Postgres runs on.
+- Add support for RHEL7 and Ubuntu 14.04.
+- Add `default_db` to postgresql::server::database.
+- Widen the selection of unquoted parameters in postgresql_conf{}
+- Require the service within postgresql::server::reload for RHEL7.
+- Add `inherit` to postgresql::server::role.
+
+####Bugfixes
+
 ##2014-03-04 - Supported Release 3.3.3
 ###Summary
 

Modulefile

@@ -1,13 +0,0 @@
-name 'puppetlabs-postgresql'
-version '3.3.3'
-source 'git://github.com/puppetlabs/puppet-postgresql.git'
-author 'Inkling/Puppet Labs'
-description 'PostgreSQL defined resource types'
-summary 'PostgreSQL defined resource types'
-license 'ASL 2.0'
-project_page 'https://github.com/puppetlabs/puppet-postgresql'
-
-dependency 'puppetlabs/stdlib', '>=3.2.0 <5.0.0'
-dependency 'puppetlabs/firewall', '>= 0.0.4'
-dependency 'puppetlabs/apt', '>=1.1.0 <2.0.0'
-dependency 'puppetlabs/concat', '>= 1.0.0 <2.0.0'

README.md

@@ -853,6 +853,11 @@ Current it is only actively tested with the following operating systems:
 
 Although patches are welcome for making it work with other OS distros, it is considered best effort.
 
+### Postgis support
+
+Postgis is currently considered an unsupported feature as it doesn't work on
+all platforms correctly.
+
 ### All versions of RHEL/Centos
 
 If you have selinux enabled you must add any custom ports you use to the postgresql_port_t context.  You can do this as follows:
@@ -861,12 +866,6 @@ If you have selinux enabled you must add any custom ports you use to the postgre
 # semanage port -a -t postgresql_port_t -p tcp $customport
 ```
 
-### RHEL7
-
-Currently the following features are unsupported:
-
-* Postgis (There is no existing postgis package for RHEL7, and it's not in EPEL7 yet.)
-
 Development
 ------------
 

manifests/server/config_entry.pp

@@ -11,6 +11,10 @@ define postgresql::server::config_entry (
     default => $path,
   }
 
+  Exec {
+    logoutput => 'on_failure',
+  }
+
   case $name {
     /data_directory|hba_file|ident_file|include|listen_addresses|port|max_connections|superuser_reserved_connections|unix_socket_directory|unix_socket_group|unix_socket_permissions|bonjour|bonjour_name|ssl|ssl_ciphers|shared_buffers|max_prepared_transactions|max_files_per_process|shared_preload_libraries|wal_level|wal_buffers|archive_mode|max_wal_senders|hot_standby|logging_collector|silent_mode|track_activity_query_size|autovacuum_max_workers|autovacuum_freeze_max_age|max_locks_per_transaction|max_pred_locks_per_transaction|restart_after_crash|lc_messages|lc_monetary|lc_numeric|lc_time/: {
       Postgresql_conf {

metadata.json

@@ -1,4 +1,12 @@
 {
+  "name": "puppetlabs-postgresql",
+  "version": "3.4.1",
+  "author": "Inkling/Puppet Labs",
+  "summary": "PostgreSQL defined resource types",
+  "license": "ASL 2.0",
+  "source": "git://github.com/puppetlabs/puppet-postgresql.git",
+  "project_page": "https://github.com/puppetlabs/puppet-postgresql",
+  "issues_url": "https://github.com/puppetlabs/puppet-postgresql/issues",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -51,21 +59,14 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": "3.2.x"
+      "version_requirement": ">= 3.2.0 < 3.4.0"
     },
     {
       "name": "puppet",
       "version_requirement": "3.x"
     }
   ],
-  "name": "puppetlabs-postgresql",
-  "version": "3.3.3",
-  "source": "git://github.com/puppetlabs/puppet-postgresql.git",
-  "author": "Inkling/Puppet Labs",
-  "license": "ASL 2.0",
-  "summary": "PostgreSQL defined resource types",
   "description": "PostgreSQL defined resource types",
-  "project_page": "https://github.com/puppetlabs/puppet-postgresql",
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",

spec/spec_helper.rb

@@ -7,12 +7,6 @@ RSpec.configure do |c|
   c.include PuppetlabsSpec::Files
 
   c.before :each do
-    # Ensure that we don't accidentally cache facts and environment
-    # between test cases.
-    Facter::Util::Loader.any_instance.stubs(:load_all)
-    Facter.clear
-    Facter.clear_messages
-
     # Store any environment variables away to be restored later
     @old_env = {}
     ENV.each_key {|k| @old_env[k] = ENV[k]}

spec/unit/provider/postgresql_conf/parsed_spec.rb

@@ -9,7 +9,7 @@ describe provider_class do
     conf_class = Puppet::Type.type(:postgresql_conf)
     provider = conf_class.provider(:parsed)
     conffile = tmpfilename('postgresql.conf')
-    provider.any_instance.stubs(:target).returns conffile
+    provider.any_instance.stub(:target).and_return conffile
     provider
   }
 

spec/unit/type/postgresql_conf_spec.rb

@@ -4,8 +4,8 @@ require 'spec_helper'
 describe Puppet::Type.type(:postgresql_conf) do
   before do
     @provider_class = described_class.provide(:simple) { mk_resource_methods }
-    @provider_class.stubs(:suitable?).returns true
-    described_class.stubs(:defaultprovider).returns @provider_class
+    @provider_class.stub(:suitable?).and_return true
+    described_class.stub(:defaultprovider).and_return @provider_class
   end
 
   describe "namevar validation" do