freighthop 0.0.6 → 0.1.0

data/modules/postgresql/manifests/server.pp

@@ -1,93 +1,71 @@
-# Class: postgresql::server
-#
-# == Class: postgresql::server
-# Manages the installation of the postgresql server.  manages the package and
-# service.
-#
-# === Parameters:
-# [*package_name*] - name of package
-# [*service_name*] - name of service
-#
-# Configuration:
-#   Advanced configuration setting parameters can be placed into 'postgresql_puppet_extras.conf' (located in the same
-#   folder as 'postgresql.conf'). You can manage that file as a normal puppet file resource, or however you see fit;
-#   which gives you complete control over the settings. Any value you specify in that file will override any existing
-#   value set in the templated version.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
+# This installs a PostgreSQL server. See README.md for more details.
 class postgresql::server (
-  $ensure           = 'present',
-  $package_name     = $postgresql::params::server_package_name,
-  $package_ensure   = 'present',
-  $service_name     = $postgresql::params::service_name,
-  $service_provider = $postgresql::params::service_provider,
-  $service_status   = $postgresql::params::service_status,
-  $config_hash      = {},
-  $datadir          = $postgresql::params::datadir
-) inherits postgresql::params {
+  $ensure                     = $postgresql::params::ensure,
 
-  if ($ensure == 'absent') {
-    service { 'postgresqld':
-      ensure    => stopped,
-      name      => $service_name,
-      enable    => false,
-      provider  => $service_provider,
-      hasstatus => true,
-      status    => $service_status,
-    }->
-    package { 'postgresql-server':
-      ensure  => purged,
-      name    => $package_name,
-      tag     => 'postgresql',
-    }->
-    file { $datadir:
-      ensure  => absent,
-      recurse => true,
-      force   => true,
-    }
-  } else {
-    package { 'postgresql-server':
-      ensure  => $package_ensure,
-      name    => $package_name,
-      tag     => 'postgresql',
-    }
+  $version                    = $postgresql::params::version,
 
-    $config_class = {
-      'postgresql::config' => $config_hash,
-    }
+  $postgres_password          = undef,
 
-    create_resources( 'class', $config_class )
+  $package_name               = $postgresql::params::server_package_name,
+  $package_ensure             = $ensure,
 
-    service { 'postgresqld':
-      ensure    => running,
-      name      => $service_name,
-      enable    => true,
-      require   => Package['postgresql-server'],
-      provider  => $service_provider,
-      hasstatus => true,
-      status    => $service_status,
-    }
+  $plperl_package_name        = $postgresql::params::plperl_package_name,
 
-    if ($postgresql::params::needs_initdb) {
-      include postgresql::initdb
+  $service_name               = $postgresql::params::service_name,
+  $service_provider           = $postgresql::params::service_provider,
+  $service_status             = $postgresql::params::service_status,
+  $default_database           = $postgresql::params::default_database,
 
-      Package['postgresql-server'] -> Class['postgresql::initdb'] -> Class['postgresql::config'] -> Service['postgresqld']
-    }
-    else  {
-      Package['postgresql-server'] -> Class['postgresql::config'] -> Service['postgresqld']
-    }
+  $listen_addresses           = $postgresql::params::listen_addresses,
+  $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user,
+  $ip_mask_allow_all_users    = $postgresql::params::ip_mask_allow_all_users,
+  $ipv4acls                   = $postgresql::params::ipv4acls,
+  $ipv6acls                   = $postgresql::params::ipv6acls,
 
-    exec { 'reload_postgresql':
-      path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-      command     => "service ${service_name} reload",
-      onlyif      => $service_status,
-      refreshonly => true,
-    }
-  }
+  $initdb_path                = $postgresql::params::initdb_path,
+  $createdb_path              = $postgresql::params::createdb_path,
+  $psql_path                  = $postgresql::params::psql_path,
+  $pg_hba_conf_path           = $postgresql::params::pg_hba_conf_path,
+  $postgresql_conf_path       = $postgresql::params::postgresql_conf_path,
+
+  $datadir                    = $postgresql::params::datadir,
+
+  $pg_hba_conf_defaults       = $postgresql::params::pg_hba_conf_defaults,
+
+  $user                       = $postgresql::params::user,
+  $group                      = $postgresql::params::group,
+
+  $needs_initdb               = $postgresql::params::needs_initdb,
 
+  $encoding                   = $postgresql::params::encoding,
+  $locale                     = $postgresql::params::locale,
+
+  $manage_firewall            = $postgresql::params::manage_firewall,
+  $manage_pg_hba_conf         = $postgresql::params::manage_pg_hba_conf,
+  $firewall_supported         = $postgresql::params::firewall_supported
+) inherits postgresql::params {
+  $pg = 'postgresql::server'
+
+  if ($ensure == 'present' or $ensure == true) {
+    # Reload has its own ordering, specified by other defines
+    class { "${pg}::reload": require => Class["${pg}::install"] }
+
+    anchor { "${pg}::start": }->
+    class { "${pg}::install": }->
+    class { "${pg}::initdb": }->
+    class { "${pg}::config": }->
+    class { "${pg}::service": }->
+    class { "${pg}::passwd": }->
+    class { "${pg}::firewall": }->
+    anchor { "${pg}::end": }
+  } else {
+    anchor { "${pg}::start": }->
+    class { "${pg}::firewall": }->
+    class { "${pg}::passwd": }->
+    class { "${pg}::service": }->
+    class { "${pg}::install": }->
+    class { "${pg}::initdb": }->
+    class { "${pg}::config": }->
+    anchor { "${pg}::end": }
+  }
 }

data/modules/postgresql/manifests/validate_db_connection.pp

@@ -1,65 +1,62 @@
-# Define: postgresql::validate_db_connection
-#
 # This type validates that a successful postgres connection can be established
 # between the node on which this resource is run and a specified postgres
 # instance (host/port/user/password/database name).
 #
-# Parameters:
-#   [*database_host*]       - the hostname or IP address of the machine where the
-#                             postgres server should be running.
-#   [*database_port*]       - the port on which postgres server should be
-#                             listening (defaults to 5432).
-#   [*database_username*]   - the postgres username
-#   [*database_password*]   - the postgres user's password
-#   [*database_name*]       - the database name that the connection should be
-#                             established against
-#
-# NOTE: to some degree this type assumes that you've created the corresponding
-# postgres database instance that you are validating by using the
-# `postgresql::db` or `postgresql::database` type provided by this module
-# elsewhere in your manifests.
-#
-# Actions:
-#
-# Attempts to establish a connection to the specified postgres database.  If
-#  a connection cannot be established, the resource will fail; this allows you
-#  to use it as a dependency for other resources that would be negatively
-#  impacted if they were applied without the postgres connection being available.
-#
-# Requires:
-#
-#  `psql` commandline tool (will automatically install the system's postgres
-#                           client package if it is not already installed.)
-#
-# Sample Usage:
-#
-#  postgresql::validate_db_connection { 'validate my postgres connection':
-#      database_host           => 'my.postgres.host',
-#      database_username       => 'mydbuser',
-#      database_password       => 'mydbpassword',
-#      database_name           => 'mydbname',
-#  }
-#
-
+# See README.md for more details.
 define postgresql::validate_db_connection(
-  $database_host,
-  $database_name,
-  $database_password,
-  $database_username,
-  $database_port = 5432
+  $database_host     = undef,
+  $database_name     = undef,
+  $database_password = undef,
+  $database_username = undef,
+  $database_port     = undef,
+  $run_as            = undef,
+  $sleep             = 2,
+  $tries             = 10,
+  $create_db_first   = true
 ) {
   require postgresql::client
+  include postgresql::params
 
-  # TODO: port to ruby
-  $psql = "${postgresql::params::psql_path} --tuples-only --quiet -h ${database_host} -U ${database_username} -p ${database_port} --dbname ${database_name}"
+  $psql_path = $postgresql::params::psql_path
+
+  $cmd_init = "${psql_path} --tuples-only --quiet "
+  $cmd_host = $database_host ? {
+    default => "-h ${database_host} ",
+    undef   => "",
+  }
+  $cmd_user = $database_username ? {
+    default => "-U ${database_username} ",
+    undef   => "",
+  }
+  $cmd_port = $database_port ? {
+    default => "-p ${database_port} ",
+    undef   => "",
+  }
+  $cmd_dbname = $database_name ? {
+    default => "--dbname ${database_name} ",
+    undef   => "--dbname ${postgresql::params::default_database} ",
+  }
+  $env = $database_password ? {
+    default => "PGPASSWORD=${database_password}",
+    undef   => undef,
+  }
+  $cmd = join([$cmd_init, $cmd_host, $cmd_user, $cmd_port, $cmd_dbname])
+  $validate_cmd = "/usr/local/bin/validate_postgresql_connection.sh ${sleep} ${tries} '${cmd}'"
+
+  # This is more of a safety valve, we add a little extra to compensate for the
+  # time it takes to run each psql command.
+  $timeout = (($sleep + 2) * $tries)
 
   $exec_name = "validate postgres connection for ${database_host}/${database_name}"
   exec { $exec_name:
-    command     => '/bin/false',
-    unless      => "/bin/echo \"SELECT 1\" | ${psql}",
+    command     => "echo 'Unable to connect to defined database using: ${cmd}' && false",
+    unless      => $validate_cmd,
     cwd         => '/tmp',
-    environment => "PGPASSWORD=${database_password}",
+    environment => $env,
     logoutput   => 'on_failure',
+    user        => $run_as,
+    path        => '/bin',
+    timeout     => $timeout,
     require     => Package['postgresql-client'],
   }
 
@@ -72,5 +69,7 @@ define postgresql::validate_db_connection(
   # We accomplish this by using Puppet's resource collection syntax to search
   # for the Database resource in our current catalog; if it exists, the
   # appropriate relationship is created here.
-  Database<|title == $database_name|> -> Exec[$exec_name]
+  if($create_db_first) {
+    Postgresql::Server::Database<|title == $database_name|> -> Exec[$exec_name]
+  }
 }

data/modules/postgresql/metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-postgresql",
-  "version": "2.5.0",
+  "version": "3.2.0",
   "source": "git://github.com/puppetlabs/puppet-postgresql.git",
   "author": "Inkling/Puppet Labs",
   "license": "ASL 2.0",
@@ -21,11 +21,41 @@
       "version_requirement": ">=1.1.0 <2.0.0"
     },
     {
-      "name": "ripienaar/concat",
-      "version_requirement": ">= 0.2.0"
+      "name": "puppetlabs/concat",
+      "version_requirement": ">= 1.0.0 <2.0.0"
     }
   ],
   "types": [
+    {
+      "name": "postgresql_conf",
+      "doc": "This type allows puppet to manage postgresql.conf parameters.",
+      "properties": [
+        {
+          "name": "ensure",
+          "doc": "The basic property that the resource should be in.  Valid values are `present`, `absent`."
+        },
+        {
+          "name": "value",
+          "doc": "The value to set for this parameter."
+        },
+        {
+          "name": "target",
+          "doc": "The path to postgresql.conf"
+        }
+      ],
+      "parameters": [
+        {
+          "name": "name",
+          "doc": "The postgresql parameter name to manage.  Values can match `/^[\\w\\.]+$/`."
+        }
+      ],
+      "providers": [
+        {
+          "name": "parsed",
+          "doc": "Set key/values in postgresql.conf."
+        }
+      ]
+    },
     {
       "name": "postgresql_psql",
       "doc": "",
@@ -48,6 +78,10 @@
           "name": "db",
           "doc": "The name of the database to execute the SQL command against."
         },
+        {
+          "name": "search_path",
+          "doc": "The schema search path to use when executing the SQL command"
+        },
         {
           "name": "psql_path",
           "doc": "The path to psql executable."
@@ -78,85 +112,101 @@
     }
   ],
   "checksums": {
-    "Changelog": "194eda44c6768cc12209b73fc0c0f515",
-    "Gemfile": "e8ed3cac67291082eab15484bcd125f1",
-    "Gemfile.lock": "219b83deea2bcd02123f7d7443bfbcfd",
-    "LICENSE": "a781715ebc5e3e0956ee6baec3140e58",
-    "Modulefile": "4f7400eba827477bdfb51e62016ce0e0",
-    "README.md": "c780052b0aba70c0dfb91a3910352b9d",
+    "Changelog": "3bff00e6b5ac42cd8055ee8d7337c4ff",
+    "Gemfile": "d29b809bd75c2aa7c160e45e66483d8c",
+    "Gemfile.lock": "9c04244f3ad5b505c9f36daf40a5677f",
+    "LICENSE": "746fe83ebbf8970af0a9ea13962293e9",
+    "Modulefile": "6a824d502980df77edf9d414b5e3e2f2",
+    "NOTICE": "d8ffc52f00e00877b45d2b77e709f69e",
+    "README.md": "049d45d3aa128c29e16e9a0dcf67517f",
     "Rakefile": "7e458ced5c7b798430ee6371f860057e",
-    "examples/init.pp": "f7772943903ec859df2e43b61b700fd4",
-    "examples/official-postgresql-repos.pp": "44e02f3c93b7d5edf1647d608c4e6310",
-    "examples/postgresql_database.pp": "8c631bdc1a57c3e82b203ec3d5dde5e1",
-    "examples/postgresql_db.pp": "2db756a3dea26055fd9aa8e63201ec4d",
-    "examples/postgresql_grant.pp": "6f1e08c4f7394b32573a70acc314c3a7",
-    "examples/postgresql_pg_hba_rule.pp": "4591748c68d75a1014991de70a83aaaa",
-    "examples/postgresql_pgconf_extras.pp": "51b8d3bf9847a7d7c2a33b131705496f",
-    "examples/postgresql_tablespace.pp": "f3f6b0c2b6ff09b73ff36138604e2b92",
-    "examples/postgresql_user.pp": "974917490d130306d45fbb8edee2d6b6",
-    "examples/server.pp": "7a44884738b92730cdcc0282a581dce2",
     "files/RPM-GPG-KEY-PGDG": "78b5db170d33f80ad5a47863a7476b22",
-    "lib/facter/postgres_default_version.rb": "53c88744595fa06f0ce7f08211a46ae2",
+    "files/validate_postgresql_connection.sh": "20301932819f035492a30880f5bf335a",
     "lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb": "d518a7959b950874820a3b0a7a324488",
     "lib/puppet/parser/functions/postgresql_escape.rb": "2e136fcd653ab38d831c5b40806d47d1",
     "lib/puppet/parser/functions/postgresql_password.rb": "820da02a888ab42357fe9bc2352b1c37",
-    "lib/puppet/provider/postgresql_psql/ruby.rb": "07b38b76285d3fc9cf073be6fca99889",
-    "lib/puppet/type/postgresql_psql.rb": "66b00c51be519fa3f1a38e50d2284f27",
-    "manifests/client.pp": "462bae5ffbcc40b1172e5fdbfdb909bf",
-    "manifests/config/afterservice.pp": "c4f27044577799f9ed7af8f3c52fb0b4",
-    "manifests/config/beforeservice.pp": "8f2a08efc5001bd63718d4e0c52c42ef",
-    "manifests/config.pp": "b706fce0f64d6c8bd5ffd0b4925fb3f1",
-    "manifests/contrib.pp": "98290abf6dd2aa4c6bac0e3746ab85c0",
-    "manifests/database.pp": "b105ae2f6aafa1adc4f23e2e28a8819c",
-    "manifests/database_grant.pp": "3f9c69a817be47d8bf940f6a1002d4d0",
-    "manifests/database_user.pp": "b5f9fdff0bdbd751dfc5f493bddcf1e3",
-    "manifests/db.pp": "e7b027d31c7ddcf73e435c5a8258fbc2",
-    "manifests/devel.pp": "4ae7a114c635874555489c15a512b124",
-    "manifests/grant.pp": "8d13bc521cd6396f69600a0fc94e0db1",
-    "manifests/init.pp": "229910d441d3881e4389d3a2bcd37c3a",
-    "manifests/initdb.pp": "9d14ae813bed54ad46d791ed490588d7",
-    "manifests/java.pp": "be65d349b7657f3cc4b8dd4195e21a7c",
-    "manifests/package_source/apt_postgresql_org.pp": "f2077dde857658cd3a12c9956ac879d7",
-    "manifests/package_source/yum_postgresql_org.pp": "4a80fe043d9710da0bcc34a3450159ca",
-    "manifests/params.pp": "fa3b81a7043a80c20c1dee5269aecb61",
-    "manifests/pg_hba.pp": "d5e130f3a2e1023061dcfb8cff8fad07",
-    "manifests/pg_hba_rule.pp": "032477ffac94d72b30c8108394568e89",
-    "manifests/plperl.pp": "32802554a728f8e139a1c09fcc7856d6",
-    "manifests/psql.pp": "339bae8e795f5bcf5550a88ad1e1105d",
-    "manifests/python.pp": "cd2c8d7624ac6146fd0b9d4b8cc57ef5",
-    "manifests/role.pp": "0696135a4cca68b718c9f46880ab3ddc",
-    "manifests/server.pp": "c66e8ed7ae608f946eef777f989ffc46",
-    "manifests/table_grant.pp": "10909deaf4f26d8ea265076275919a89",
-    "manifests/tablespace.pp": "37d8393a8d92b3b7ba1a6236cba13a9b",
-    "manifests/validate_db_connection.pp": "ce1ef5d7c00b191e31b422422cee1a4a",
+    "lib/puppet/provider/postgresql_conf/parsed.rb": "9c198422c0558faab1bedc00b68cfe45",
+    "lib/puppet/provider/postgresql_psql/ruby.rb": "506a07dc159de91fe212133103b9dcff",
+    "lib/puppet/type/postgresql_conf.rb": "4f333138a3689f9768e7fe4bc3cde9fd",
+    "lib/puppet/type/postgresql_psql.rb": "2c1270cfed4ffb2971059846a57cf983",
+    "manifests/client.pp": "f9bc3a578017fe8eb881de2255bdc023",
+    "manifests/globals.pp": "64d9cdb6894ba6334992e9365a1e2096",
+    "manifests/lib/devel.pp": "94ae7eac3acf1dd3072d481eca4d2d7f",
+    "manifests/lib/java.pp": "6e4a2187c2b4caecad8098b46e99c8e0",
+    "manifests/lib/python.pp": "90736f86301c4c6401ec1180c176b616",
+    "manifests/params.pp": "109138ba7df4ad7da71b302a20f33b29",
+    "manifests/repo/apt_postgresql_org.pp": "ef7012ea3c5429bea11b1114183d32c3",
+    "manifests/repo/yum_postgresql_org.pp": "e0c445f877cdb39774b735417c967d1d",
+    "manifests/repo.pp": "a18a5cb760dbb1e10bdd83730300c1fe",
+    "manifests/server/config.pp": "a05f4aeb3f09b2e5e9ee8b9467519afb",
+    "manifests/server/config_entry.pp": "a3823efa15fe96535335bd7b722fef9a",
+    "manifests/server/contrib.pp": "3112bd1edbed51b68e1402027f9d53b1",
+    "manifests/server/database.pp": "ebf356e8cadf5bef884e5597fd60724e",
+    "manifests/server/database_grant.pp": "66e5470bb932b087b540c444ee49941b",
+    "manifests/server/db.pp": "f35e4974ffee6136e2de1a3edc9cbf21",
+    "manifests/server/firewall.pp": "98632b073511a00926908c6951851052",
+    "manifests/server/grant.pp": "81c8d6b64a6b938fe57346ede5cdfeb7",
+    "manifests/server/initdb.pp": "91e27eaf448817c0f904e5267816a16a",
+    "manifests/server/install.pp": "8520e3a86c74e0587a46c4548097bab3",
+    "manifests/server/passwd.pp": "96214f099cfb97d361f9bdc0734baf38",
+    "manifests/server/pg_hba_rule.pp": "01a1bf9503f908531af9990909d8ba45",
+    "manifests/server/plperl.pp": "d6a2e2f0c93c7b543e9db64202c2e48d",
+    "manifests/server/reload.pp": "d62c048c8f25c167d266e99e36c0f227",
+    "manifests/server/role.pp": "43eeda8b6a40b587d688e2ce33c4e780",
+    "manifests/server/service.pp": "e1896d429a032c4522201e9048d204db",
+    "manifests/server/table_grant.pp": "bbc864f0ad8545837cf7782d1f7a1755",
+    "manifests/server/tablespace.pp": "beda12859757f7f677a711304dfd5185",
+    "manifests/server.pp": "d147bf997967eeb428c6e681dbe89d67",
+    "manifests/validate_db_connection.pp": "be61434836f7d25cc184126a91b2e3e6",
     "spec/spec_helper.rb": "d4e4a9a154ada34e7f13b0d8ece0f5db",
-    "spec/spec_helper_system.rb": "56e45808e53c1259b10870621606a891",
-    "spec/system/install_spec.rb": "9ca6ca7ff43534eebee2281037676a89",
-    "spec/system/non_defaults_spec.rb": "356c383f0ca7253841437efb68b9c77b",
-    "spec/unit/classes/client_spec.rb": "60e55a28a18b2370dac9c79fc175ba2f",
-    "spec/unit/classes/contrib_spec.rb": "16713d2b385cb20b29d0cdb95480ed01",
-    "spec/unit/classes/devel_spec.rb": "8f24f839c5ced188e5a373fe469d4f29",
-    "spec/unit/classes/init_spec.rb": "d8fdd6f2b67570832606b56704fc48f6",
-    "spec/unit/classes/params_spec.rb": "f35c148917971a3e50c48c22c17eab18",
-    "spec/unit/classes/postgresql_java_spec.rb": "a073702d2443d45abba0b5e2a719c863",
-    "spec/unit/classes/postgresql_python_spec.rb": "de978ff4029e0f7309b8a144553c01eb",
-    "spec/unit/classes/server_spec.rb": "a89d34b468251a36ab7c55e7fb619a5f",
-    "spec/unit/defines/database_grant_spec.rb": "b3ec60b58c6f917061bca0a48adbf0b7",
-    "spec/unit/defines/database_spec.rb": "b9f0face88bc301d68f460208ba72df4",
-    "spec/unit/defines/database_user_spec.rb": "2cb9eaf726859d82baeb6d4a6bf453c4",
-    "spec/unit/defines/db_spec.rb": "9b99d7f4145b3081d1b025e30f13b3fc",
-    "spec/unit/defines/pg_hba_rule_spec.rb": "9b7a77c48088d36f9a95b2d82caca8cf",
-    "spec/unit/defines/pg_hba_spec.rb": "ea0c151170a9eab5398f66ca191b0383",
-    "spec/unit/defines/psql_spec.rb": "c08ca62b81c68609cca83ec1c60fda55",
-    "spec/unit/defines/role_spec.rb": "84def95468a82e156a01abfa5e5cb40d",
-    "spec/unit/defines/tablespace_spec.rb": "fd65a12b4e447421ca0ef0f496aa7cf0",
-    "spec/unit/defines/validate_db_connection_spec.rb": "1dfe61aca3e98cb96510b3d275097b02",
-    "spec/unit/facts/postgres_default_version_spec.rb": "0a592d4c1a3948f9a661004cd22fcfc2",
+    "spec/spec_helper_system.rb": "ecedca722f54627ef2c5f8a0da5f2163",
+    "spec/system/client_spec.rb": "b477056c567ecc479a3bbc6e283df7ba",
+    "spec/system/common_patterns_spec.rb": "696033dd862db23f45e86b2099e47810",
+    "spec/system/contrib_spec.rb": "326208830a51cf74841bae361709863a",
+    "spec/system/lib/devel_spec.rb": "5e69579d3e2e4f854640e3afb1122162",
+    "spec/system/lib/java_spec.rb": "e88f705ae328f8a830ae027fca35a474",
+    "spec/system/lib/python_spec.rb": "2690f7530f806fa52cbedbb2c86988e6",
+    "spec/system/postgresql_psql_spec.rb": "6dd5c8ec1e0f493143fa2b89b044ee3d",
+    "spec/system/server/config_entry_spec.rb": "0a8a3c42efad84ab7aca367b8c3e8160",
+    "spec/system/server/database_grant_spec.rb": "f5736d6ac16ad1d2ed5f9f3442e3dda4",
+    "spec/system/server/database_spec.rb": "5405572c72b39d72d7975da02eef8569",
+    "spec/system/server/db_spec.rb": "5a6fcf61718af48e2b1fb79ba040da93",
+    "spec/system/server/grant_spec.rb": "fc629944a71faa1d871f3d3a7e4e4a83",
+    "spec/system/server/pg_hba_rule_spec.rb": "ff0c8c772ed60f8667dd2531029830b9",
+    "spec/system/server/plperl_spec.rb": "cd54753b2c8d5e4aaad13daeb8b61e7a",
+    "spec/system/server/role_spec.rb": "5b566002ba577f737d4e2a7b3fccb221",
+    "spec/system/server/table_grant_spec.rb": "260490ebb6c8b9b9f73551fb4eca8ea5",
+    "spec/system/server/tablespace_spec.rb": "48fed176f821c77d24366d70e9d15ff2",
+    "spec/system/server_spec.rb": "e93f4a14e5916eac7961e8d5215e16e2",
+    "spec/system/validate_db_connection_spec.rb": "1a454b555c6f0539d7e6e47e177a68cf",
+    "spec/unit/classes/client_spec.rb": "b26438da8906e68d17e568252c1e43b5",
+    "spec/unit/classes/globals_spec.rb": "952cba1463ca000e288cbfd56ec8c771",
+    "spec/unit/classes/lib/devel_spec.rb": "f660eb0afe4fa75e999ab192e39b58d8",
+    "spec/unit/classes/lib/java_spec.rb": "bdb60c3b379a3788b3bf1f6c29b31c0a",
+    "spec/unit/classes/lib/python_spec.rb": "677c763c1a43a0e33ef7e6e819ec9f0a",
+    "spec/unit/classes/params_spec.rb": "2661b999fc13cd3368b54549f3267be0",
+    "spec/unit/classes/repo_spec.rb": "a24b152315c86146881b6a39a7a22cd0",
+    "spec/unit/classes/server/contrib_spec.rb": "16528171ee3e058c06c5fea454dc9dbc",
+    "spec/unit/classes/server/initdb_spec.rb": "7f17f9cc6091c9e9ff789dc2f1653bff",
+    "spec/unit/classes/server/plperl_spec.rb": "120e0280679b21b4348dd992f39f83b3",
+    "spec/unit/classes/server_spec.rb": "244a793964c16cb3f4d819998e8f07a4",
+    "spec/unit/defines/server/config_entry_spec.rb": "cc2d9d0e4508d745f85c3446ccf76eb4",
+    "spec/unit/defines/server/database_grant_spec.rb": "e09254037c042efa5a29ba8d777c882f",
+    "spec/unit/defines/server/database_spec.rb": "090e9cf334843a4dc8b3f4eadce0109b",
+    "spec/unit/defines/server/db_spec.rb": "9f2181b0df771f4c6adf089b788adf42",
+    "spec/unit/defines/server/grant_spec.rb": "b8d8f46c7c4539747ee0b797a3a1834f",
+    "spec/unit/defines/server/pg_hba_rule_spec.rb": "3ed69d689bf28b56a030c543e7ce6775",
+    "spec/unit/defines/server/role_spec.rb": "fdb53fa637ccd79f8231e15383099137",
+    "spec/unit/defines/server/table_grant_spec.rb": "bb794a0b15dc74e8c8fa5d4878fd3c79",
+    "spec/unit/defines/server/tablespace_spec.rb": "68e7b9a193475491c58485debf1be220",
+    "spec/unit/defines/validate_db_connection_spec.rb": "88e57a8f780d381d75fe062f1178e1ce",
     "spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb": "e7740c3cd2110e2fcebab8356012267c",
     "spec/unit/functions/postgresql_escape_spec.rb": "6e52e4f3ca56491f8ba2d1490a5fd1ad",
     "spec/unit/functions/postgresql_password_spec.rb": "76034569a5ff627073c5e6ff69176ac3",
-    "spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb": "27b57d51cdabbbd94c2f304ca2718002",
-    "spec/unit/puppet/type/postgresql_psql_spec.rb": "31b8beacb1b2614af1c2220dc25ac5b8",
+    "spec/unit/provider/postgresql_conf/parsed_spec.rb": "7295501a413d8cf99df6f40ea50a36fc",
+    "spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb": "deef7a3f574269889e7d050a55e847f4",
+    "spec/unit/puppet/type/postgresql_psql_spec.rb": "2af5b74f7f4b89ff246818cd79488b3e",
+    "spec/unit/type/postgresql_conf_spec.rb": "76f460e0dfc90a1f38c407e5a0d4f463",
     "templates/pg_hba_rule.conf": "13b46eecdfd359eddff71fa485ef2f54"
   }
 }

data/modules/postgresql/spec/spec_helper_system.rb

@@ -1,7 +1,19 @@
 require 'rspec-system/spec_helper'
 require 'rspec-system-puppet/helpers'
+require 'rspec-system-serverspec/helpers'
 require 'tempfile'
 
+include Serverspec::Helper::RSpecSystem
+include Serverspec::Helper::DetectOS
+
+class String
+  # Provide ability to remove indentation from strings, for the purpose of
+  # left justifying heredoc blocks.
+  def unindent
+    gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "")
+  end
+end
+
 module LocalHelpers
   include RSpecSystem::Util
 
@@ -37,7 +49,7 @@ RSpec.configure do |c|
     shell('puppet module install puppetlabs/stdlib')
     shell('puppet module install puppetlabs/firewall')
     shell('puppet module install puppetlabs/apt')
-    shell('puppet module install ripienaar/concat')
+    shell('puppet module install puppetlabs/concat')
 
     file = Tempfile.new('foo')
     begin

data/modules/postgresql/spec/system/client_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper_system'
+
+describe 'postgresql::client:' do
+  after :all do
+    # Cleanup after tests have ran
+    puppet_apply("class { 'postgresql::client': package_ensure => purged }") do |r|
+      r.exit_code.should_not == 1
+    end
+  end
+
+  it 'test loading class with no parameters' do
+    pp = <<-EOS.unindent
+      class { 'postgresql::client': }
+    EOS
+
+    puppet_apply(pp) do |r|
+      r.exit_code.should_not == 1
+      r.refresh
+      r.exit_code.should == 0
+    end
+  end
+end

data/modules/postgresql/spec/system/common_patterns_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper_system'
+
+describe 'common patterns:' do
+  describe 'postgresql.conf include pattern' do
+    after :all do
+      pp = <<-EOS.unindent
+        class { 'postgresql::server': ensure => absent }
+
+        file { '/tmp/include.conf':
+          ensure => absent
+        }
+      EOS
+      puppet_apply(pp) do |r|
+        r.exit_code.should_not == 1
+      end
+    end
+
+    it "should support an 'include' directive at the end of postgresql.conf" do
+      pending('no support for include directive with centos 5/postgresql 8.1',
+        :if => (node.facts['osfamily'] == 'RedHat' and node.facts['lsbmajdistrelease'] == '5'))
+
+      pp = <<-EOS.unindent
+        class { 'postgresql::server': }
+
+        $extras = "/etc/postgresql-include.conf"
+
+        file { $extras:
+          content => 'max_connections = 123',
+          seltype => 'postgresql_db_t',
+          seluser => 'system_u',
+          notify  => Class['postgresql::server::service'],
+        }
+
+        postgresql::server::config_entry { 'include':
+          value   => $extras,
+          require => File[$extras],
+        }
+      EOS
+
+      puppet_apply(pp) do |r|
+        r.exit_code.should == 2
+        r.refresh
+        r.exit_code.should == 0
+      end
+
+      psql('--command="show max_connections" -t') do |r|
+        r.stdout.should =~ /123/
+        r.stderr.should == ''
+        r.exit_code.should == 0
+      end
+    end
+  end
+end