freighthop 0.3.3 → 0.4.0

data/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb

@@ -6,7 +6,7 @@ describe provider_class do
   subject { provider_class }
 
   let(:root_home) { '/root' }
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
+  let(:defaults_file) { '--defaults-file=/root/.my.cnf' }
   let(:newhash) { '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' }
 
   let(:raw_users) do
@@ -35,7 +35,7 @@ usvn_user@localhost
     Facter.stubs(:value).with(:root_home).returns(root_home)
     Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
     subject.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    subject.stubs(:defaults_file).returns('--defaults-extra-file=/root/.my.cnf')
+    subject.stubs(:defaults_file).returns('--defaults-file=/root/.my.cnf')
   end
 
   describe 'self.instances' do
@@ -110,9 +110,9 @@ usvn_user@localhost
   end
 
   describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
+    it 'sets --defaults-file' do
       File.stubs(:file?).with('#{root_home}/.my.cnf').returns(true)
-      @provider.defaults_file.should == '--defaults-extra-file=/root/.my.cnf'
+      @provider.defaults_file.should == '--defaults-file=/root/.my.cnf'
     end
   end
 

data/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Puppet::Type.type(:mysql_database).provider(:mysql) do
 
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
+  let(:defaults_file) { '--defaults-file=/root/.my.cnf' }
 
   let(:raw_databases) do
     <<-SQL_OUTPUT
@@ -77,9 +77,9 @@ test
   end
 
   describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
+    it 'sets --defaults-file' do
       File.stubs(:file?).with('/root/.my.cnf').returns(true)
-      provider.defaults_file.should eq '--defaults-extra-file=/root/.my.cnf'
+      provider.defaults_file.should eq '--defaults-file=/root/.my.cnf'
     end
     it 'fails if file missing' do
       File.stubs(:file?).with('/root/.my.cnf').returns(false)

data/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Puppet::Type.type(:mysql_user).provider(:mysql) do
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
+  let(:defaults_file) { '--defaults-file=/root/.my.cnf' }
   let(:newhash) { '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' }
 
   let(:raw_users) do
@@ -84,9 +84,9 @@ usvn_user@localhost
   end
 
   describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
+    it 'sets --defaults-file' do
       File.stubs(:file?).with('/root/.my.cnf').returns(true)
-      provider.defaults_file.should eq '--defaults-extra-file=/root/.my.cnf'
+      provider.defaults_file.should eq '--defaults-file=/root/.my.cnf'
     end
     it 'fails if file missing' do
       File.expects(:file?).with('/root/.my.cnf').returns(false)

data/modules/mysql/templates/my.cnf.erb

@@ -2,11 +2,9 @@
 <% if v.is_a?(Hash) -%>
 [<%= k %>]
 <% @options[k].sort.map do |ki, vi| -%>
-<% if vi == true -%>
-<%= ki %>
-<% elsif vi and vi != '' -%>
+<% if vi and vi != '' -%>
 <%= ki %> = <%= vi %>
-<% elsif vi -%>
+<% else -%>
 <%= ki %>
 <% end -%>
 <% end -%>

data/modules/mysql/tests/mysql_grant.pp

@@ -1,4 +1,4 @@
-mysql_grant{'test1@localhost/redmine.*':
+mysql_grant{'test1@localhost/redmine':
   user       => 'test1@localhost',
   table      => 'redmine.*',
   privileges => ['UPDATE'],

data/modules/postgresql/Changelog

@@ -1,3 +1,34 @@
+2014-01-28 - Version 3.3.0
+
+Summary:
+
+This release rolls up a bunch of bugfixes our users have found and fixed for
+us over the last few months.  This improves things for 9.1 users, and makes
+this module usable on FreeBSD.
+
+This release is dedicated to 'bma', who's suffering with Puppet 3.4.1 issues
+thanks to Puppet::Util::SUIDManager.run_and_capture.
+
+Features:
+ - Add lc_ config entry settings
+ - Can pass template at database creation.
+ - Add FreeBSD support.
+ - Add support for customer `xlogdir` parameter.
+ - Switch tests from rspec-system to beaker.  (This isn't really a feature)
+
+Bugfixes:
+ - Properly fix the deprecated Puppet::Util::SUIDManager.run_and_capture errors.
+ - Fix NOREPLICATION option for Postgres 9.1
+ - Wrong parameter name: manage_pg_conf -> manage_pg_hba_conf
+ - Add $postgresql::server::client_package_name, referred to by install.pp
+ - Add missing service_provider/service_name descriptions in ::globals.
+ - Fix several smaller typos/issues throughout.
+ - Exec['postgresql_initdb'] needs to be done after $datadir exists
+ - Prevent defined resources from floating in the catalog.
+ - Fix granting all privileges on a table.
+ - Add some missing privileges.
+ - Remove deprecated and unused concat::fragment parameters.
+
 2013-11-05 - Version 3.2.0
 
 Summary:

data/modules/postgresql/Gemfile

@@ -3,9 +3,11 @@ source 'https://rubygems.org'
 group :development, :test do
   gem 'rake'
   gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-system-puppet', '~>2.0'
-  gem 'rspec-system-serverspec', '~>1.0'
+  gem 'rspec-puppet', '< 1.0'
   gem 'puppet-lint', '~> 0.3.2'
+  gem 'beaker',                  :require => false
+  gem 'beaker-rspec',            :require => false
+  gem 'serverspec',              :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']

data/modules/postgresql/Modulefile

@@ -1,5 +1,5 @@
 name 'puppetlabs-postgresql'
-version '3.2.0'
+version '3.3.0'
 source 'git://github.com/puppetlabs/puppet-postgresql.git'
 author 'Inkling/Puppet Labs'
 description 'PostgreSQL defined resource types'

data/modules/postgresql/README.md

@@ -284,10 +284,13 @@ This setting can be used to override the default postgresql PL/perl package name
 This setting can be used to override the default postgresql Python package name. If not specified, the module will use whatever package name is the default for your OS distro.
 
 ####`service_name`
-This setting can be used to override the default postgresql service provider. If not specified, the module will use whatever service name is the default for your OS distro.
+This setting can be used to override the default postgresql service name. If not specified, the module will use whatever service name is the default for your OS distro.
+
+####`service_provider`
+This setting can be used to override the default postgresql service provider. If not specified, the module will use whatever service provider is the default for your OS distro.
 
 ####`service_status`
-This setting can be used to override the default status check command for your PostgreSQL service. If not specified, the module will use whatever service name is the default for your OS distro.
+This setting can be used to override the default status check command for your PostgreSQL service. If not specified, the module will use whatever service status is the default for your OS distro.
 
 ####`default_database`
 This setting is used to specify the name of the default database to connect with. On most systems this will be "postgres".
@@ -319,6 +322,9 @@ This setting can be used to override the default postgresql configuration direct
 ####`bindir`
 This setting can be used to override the default postgresql binaries directory for the target platform. If not specified, the module will use whatever directory is the default for your OS distro.
 
+####`xlogdir`
+This setting can be used to override the default postgresql xlog directory. If not specified the module will use initdb's default path.
+
 ####`user`
 This setting can be used to override the default postgresql super user and owner of postgresql related files in the file system. If not specified, the module will use the user name 'postgres'.
 
@@ -393,7 +399,7 @@ List of strings for access control for connection method, users, databases, IPv4
 ####`ipv6acls`
 List of strings for access control for connection method, users, databases, IPv6 addresses; see [postgresql documentation](http://www.postgresql.org/docs/9.2/static/auth-pg-hba-conf.html) about `pg_hba.conf` for information (please note that the link will take you to documentation for the most recent version of Postgres, however links for earlier versions can be found on that page).
 
-####`inidb_path`
+####`initdb_path`
 Path to the `initdb` command.
 
 ####`createdb_path`
@@ -451,7 +457,7 @@ The ensure parameter passed on to postgresql client package resource.
 Installs the postgresql contrib package.
 
 ####`package_name`
-The name of the postgresql client package.
+The name of the postgresql contrib package.
 
 ####`package_ensure`
 The ensure parameter passed on to postgresql contrib package resource.

data/modules/postgresql/Rakefile

@@ -4,7 +4,6 @@ require 'bundler/setup'
 Bundler.require :default
 
 require 'puppetlabs_spec_helper/rake_tasks'
-require 'rspec-system/rake_task'
 require 'puppet-lint/tasks/puppet-lint'
 
 task :default do

data/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb

@@ -16,9 +16,15 @@ Puppet::Type.type(:postgresql_psql).provide(:ruby) do
       return nil
     end
 
-    output, status = run_unless_sql_command(resource[:unless])
+    if Puppet::PUPPETVERSION.to_f < 4
+      output, status = run_unless_sql_command(resource[:unless])
+    else
+      output = run_unless_sql_command(resource[:unless])
+      status = output.exitcode
+    end
 
     if status != 0
+      puts status
       self.fail("Error evaluating 'unless' clause: '#{output}'")
     end
     result_count = output.strip.to_i
@@ -61,10 +67,26 @@ Puppet::Type.type(:postgresql_psql).provide(:ruby) do
 
     if resource[:cwd]
       Dir.chdir resource[:cwd] do
-        Puppet::Util::SUIDManager.run_and_capture(command, resource[:psql_user], resource[:psql_group])
+        run_command(command, resource[:psql_user], resource[:psql_group])
       end
     else
-      Puppet::Util::SUIDManager.run_and_capture(command, resource[:psql_user], resource[:psql_group])
+      run_command(command, resource[:psql_user], resource[:psql_group])
+    end
+  end
+
+  def run_command(command, user, group)
+    if Puppet::PUPPETVERSION.to_f < 3.4
+      Puppet::Util::SUIDManager.run_and_capture(command, user, group)
+    else
+      output = Puppet::Util::Execution.execute(command, {
+        :uid                => user,
+        :gid                => group,
+        :failonfail         => false,
+        :combine            => true,
+        :override_locale    => true,
+        :custom_environment => {}
+      })
+      [output, $CHILD_STATUS.dup]
     end
   end
 

data/modules/postgresql/manifests/globals.pp

@@ -27,6 +27,7 @@ class postgresql::globals (
   $datadir              = undef,
   $confdir              = undef,
   $bindir               = undef,
+  $xlogdir              = undef,
 
   $user                 = undef,
   $group                = undef,
@@ -78,6 +79,7 @@ class postgresql::globals (
       /Archlinux/ => '9.2',
       default => '9.2',
     },
+    'FreeBSD' => '93',
     default => undef,
   }
   $globals_version = pick($version, $default_version, 'unknown')

data/modules/postgresql/manifests/params.pp

@@ -120,6 +120,27 @@ class postgresql::params inherits postgresql::globals {
       $firewall_supported   = pick($firewall_supported, true)
     }
 
+    'FreeBSD': {
+
+      $client_package_name  = pick($client_package_name, "databases/postgresql${version}-client")
+      $server_package_name  = pick($server_package_name, "databases/postgresql${version}-server")
+      $contrib_package_name = pick($contrib_package_name, "databases/postgresql${version}-contrib")
+      $devel_package_name   = pick($devel_package_name, 'databases/postgresql-libpqxx3')
+      $java_package_name    = pick($java_package_name, 'databases/postgresql-jdbc')
+      $plperl_package_name  = pick($plperl_package_name, "databases/postgresql${version}-plperl")
+      $python_package_name  = pick($python_package_name, 'databases/py-psycopg2')
+
+      $service_name         = pick($service_name, 'postgresql')
+      $bindir               = pick($bindir, '/usr/local/bin')
+      $datadir              = pick($datadir, '/usr/local/pgsql/data')
+      $confdir              = pick($confdir, '/usr/local/share/postgresql')
+      $service_status       = pick($service_status, "/usr/local/etc/rc.d/${service_name} status")
+      $psql_path            = pick($psql_path, "${bindir}/psql")
+
+      $firewall_supported   = pick($firewall_supported, false)
+      $needs_initdb         = pick($needs_initdb, true)
+    }
+
     default: {
       # Based on the existing version of the firewall module, this is normally
       # false for other OS, but this allows an escape hatch to override it.

data/modules/postgresql/manifests/server/config.pp

@@ -14,11 +14,6 @@ class postgresql::server::config {
   $version                    = $postgresql::server::version
   $manage_pg_hba_conf         = $postgresql::server::manage_pg_hba_conf
 
-  File {
-    owner => $user,
-    group => $group,
-  }
-
   if ($ensure == 'present' or $ensure == true) {
 
     if ($manage_pg_hba_conf == true) {

data/modules/postgresql/manifests/server/config_entry.pp

@@ -12,7 +12,7 @@ define postgresql::server::config_entry (
   }
 
   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/: {
+    /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 {
         notify => Class['postgresql::server::service'],
         before => Class['postgresql::server::reload'],

data/modules/postgresql/manifests/server/database.pp

@@ -3,6 +3,7 @@ define postgresql::server::database(
   $dbname     = $title,
   $owner      = $postgresql::server::user,
   $tablespace = undef,
+  $template   = 'template0',
   $encoding   = $postgresql::server::encoding,
   $locale     = $postgresql::server::locale,
   $istemplate = false
@@ -43,7 +44,7 @@ define postgresql::server::database(
     default => "--tablespace='${tablespace}' ",
   }
 
-  $createdb_command = "${createdb_path} --owner='${owner}' --template=template0 ${encoding_option}${locale_option}${tablespace_option} '${dbname}'"
+  $createdb_command = "${createdb_path} --owner='${owner}' --template=${template} ${encoding_option}${locale_option}${tablespace_option} '${dbname}'"
 
   postgresql_psql { "Check for existence of db '${dbname}'":
     command => 'SELECT 1',

data/modules/postgresql/manifests/server/db.pp

@@ -7,12 +7,14 @@ define postgresql::server::db (
   $locale     = $postgresql::server::locale,
   $grant      = 'ALL',
   $tablespace = undef,
+  $template   = 'template0',
   $istemplate = false,
   $owner      = undef
 ) {
   postgresql::server::database { $name:
     encoding   => $encoding,
     tablespace => $tablespace,
+    template   => $template,
     locale     => $locale,
     istemplate => $istemplate,
     owner      => $owner,

data/modules/postgresql/manifests/server/grant.pp

@@ -31,16 +31,32 @@ define postgresql::server::grant (
   )
 
   ## Validate that the object type's privilege is acceptable
+  # TODO: this is a terrible hack; if they pass "ALL" as the desired privilege,
+  #  we need a way to test for it--and has_database_privilege does not
+  #  recognize 'ALL' as a valid privilege name. So we probably need to
+  #  hard-code a mapping between 'ALL' and the list of actual privileges that
+  #  it entails, and loop over them to check them.  That sort of thing will
+  #  probably need to wait until we port this over to ruby, so, for now, we're
+  #  just going to assume that if they have "CREATE" privileges on a database,
+  #  then they have "ALL".  (I told you that it was terrible!)
   case $_object_type {
     'DATABASE': {
-      validate_string($_privilege,'CREATE','CONNECT','TEMPORARY','TEMP','ALL',
-        'ALL PRIVILEGES')
+      $unless_privilege = $_privilege ? {
+        'ALL'   => 'CREATE',
+        default => $_privilege,
+      }
+      validate_string($unless_privilege,'CREATE','CONNECT','TEMPORARY','TEMP',
+        'ALL','ALL PRIVILEGES')
       $unless_function = 'has_database_privilege'
       $on_db = $psql_db
     }
     'TABLE': {
-      validate_string($_privilege,'SELECT','INSERT','UPDATE','REFERENCES',
-        'ALL','ALL PRIVILEGES')
+      $unless_privilege = $_privilege ? {
+        'ALL'   => 'INSERT',
+        default => $_privilege,
+      }
+      validate_string($unless_privilege,'SELECT','INSERT','UPDATE','DELETE',
+        'TRUNCATE','REFERENCES','TRIGGER','ALL','ALL PRIVILEGES')
       $unless_function = 'has_table_privilege'
       $on_db = $db
     }
@@ -49,18 +65,6 @@ define postgresql::server::grant (
     }
   }
 
-  # TODO: this is a terrible hack; if they pass "ALL" as the desired privilege,
-  #  we need a way to test for it--and has_database_privilege does not
-  #  recognize 'ALL' as a valid privilege name. So we probably need to
-  #  hard-code a mapping between 'ALL' and the list of actual privileges that
-  #  it entails, and loop over them to check them.  That sort of thing will
-  #  probably need to wait until we port this over to ruby, so, for now, we're
-  #  just going to assume that if they have "CREATE" privileges on a database,
-  #  then they have "ALL".  (I told you that it was terrible!)
-  $unless_privilege = $_privilege ? {
-    'ALL'   => 'CREATE',
-    default => $_privilege,
-  }
   $grant_cmd = "GRANT ${_privilege} ON ${_object_type} \"${object_name}\" TO \"${role}\""
   postgresql_psql { $grant_cmd:
     db         => $on_db,

data/modules/postgresql/manifests/server/initdb.pp

@@ -4,6 +4,7 @@ class postgresql::server::initdb {
   $needs_initdb = $postgresql::server::needs_initdb
   $initdb_path  = $postgresql::server::initdb_path
   $datadir      = $postgresql::server::datadir
+  $xlogdir      = $postgresql::server::xlogdir
   $encoding     = $postgresql::server::encoding
   $locale       = $postgresql::server::locale
   $group        = $postgresql::server::group
@@ -18,6 +19,16 @@ class postgresql::server::initdb {
       mode   => '0700',
     }
 
+    if($xlogdir) {
+      # Make sure the xlog directory exists, and has the correct permissions.
+      file { $xlogdir:
+        ensure => directory,
+        owner  => $user,
+        group  => $group,
+        mode   => '0700',
+      }
+    }
+
     if($needs_initdb) {
       # Build up the initdb command.
       #
@@ -25,9 +36,13 @@ class postgresql::server::initdb {
       # initdb command don't accept this switch. So if the user didn't pass the
       # parameter, lets not pass the switch at all.
       $ic_base = "${initdb_path} --encoding '${encoding}' --pgdata '${datadir}'"
-      $initdb_command = $locale ? {
+      $ic_xlog = $xlogdir ? {
         undef   => $ic_base,
-        default => "${ic_base} --locale '${locale}'"
+        default => "${ic_base} --xlogdir '${xlogdir}'"
+      }
+      $initdb_command = $locale ? {
+        undef   => $ic_xlog,
+        default => "${ic_xlog} --locale '${locale}'"
       }
 
       # This runs the initdb command, we use the existance of the PG_VERSION
@@ -38,7 +53,7 @@ class postgresql::server::initdb {
         user      => $user,
         group     => $group,
         logoutput => on_failure,
-        before    => File[$datadir],
+        require   => File[$datadir],
       }
     }
   } else {
@@ -48,5 +63,14 @@ class postgresql::server::initdb {
       recurse => true,
       force   => true,
     }
+
+    if($xlogdir) {
+      # Make sure the xlog directory exists, and has the correct permissions.
+      file { $xlogdir:
+        ensure  => absent,
+        recurse => true,
+        force   => true,
+      }
+    }
   }
 }

data/modules/postgresql/manifests/server/pg_hba_rule.pp

@@ -15,8 +15,8 @@ define postgresql::server::pg_hba_rule(
   $target      = $postgresql::server::pg_hba_conf_path
 ) {
 
-  if $postgresql::server::manage_pga_conf == false {
-      fail('postgresql::server::manage_pga_conf has been disabled, so this resource is now unused and redundant, either enable that option or remove this resource from your manifests')
+  if $postgresql::server::manage_pg_hba_conf == false {
+      fail('postgresql::server::manage_pg_hba_conf has been disabled, so this resource is now unused and redundant, either enable that option or remove this resource from your manifests')
   } else {
     validate_re($type, '^(local|host|hostssl|hostnossl)$',
     "The type you specified [${type}] must be one of: local, host, hostssl, hostnosssl")
@@ -47,8 +47,6 @@ define postgresql::server::pg_hba_rule(
       target  => $target,
       content => template('postgresql/pg_hba_rule.conf'),
       order   => $order,
-      owner   => $::id,
-      mode    => '0600',
     }
   }
 }

data/modules/postgresql/manifests/server/role.pp

@@ -56,8 +56,14 @@ define postgresql::server::role(
   }
 
   if(versioncmp($version, '9.1') >= 0) {
-    postgresql_psql {"ALTER ROLE \"${username}\" ${replication_sql}":
-      unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolreplication=${replication}",
+    if $replication_sql == '' {
+      postgresql_psql {"ALTER ROLE \"${username}\" NOREPLICATION":
+        unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolreplication=${replication}",
+      }
+    } else {
+      postgresql_psql {"ALTER ROLE \"${username}\" ${replication_sql}":
+        unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolreplication=${replication}",
+      }
     }
   }
 

data/modules/postgresql/manifests/server/service.pp

@@ -13,6 +13,8 @@ class postgresql::server::service {
     default => $ensure
   }
 
+  anchor { 'postgresql::server::service::begin': }
+
   service { 'postgresqld':
     ensure    => $service_ensure,
     name      => $service_name,
@@ -35,6 +37,9 @@ class postgresql::server::service {
       tries           => 60,
       create_db_first => false,
       require         => Service['postgresqld'],
+      before          => Anchor['postgresql::server::service::end']
     }
   }
+
+  anchor { 'postgresql::server::service::end': }
 }

data/modules/postgresql/manifests/server.pp

@@ -7,6 +7,7 @@ class postgresql::server (
   $postgres_password          = undef,
 
   $package_name               = $postgresql::params::server_package_name,
+  $client_package_name        = $postgresql::params::client_package_name,  
   $package_ensure             = $ensure,
 
   $plperl_package_name        = $postgresql::params::plperl_package_name,
@@ -29,6 +30,7 @@ class postgresql::server (
   $postgresql_conf_path       = $postgresql::params::postgresql_conf_path,
 
   $datadir                    = $postgresql::params::datadir,
+  $xlogdir                    = $postgresql::params::xlogdir,
 
   $pg_hba_conf_defaults       = $postgresql::params::pg_hba_conf_defaults,