2114333539
This adds the parameter 'locale' to the 'postgresql' class so we have a global default, and adds it two the defined resources 'postgresql::db' and 'postgresql::database'. This allows users to either: * Defined a global default for the cluster * Define a per-database default As a side-effect I had to make sure 'charset' was also exposed in a similar manner as some locales need a particular charset to work. Tests were added to test both the 'createdb' case and 'initdb' case for Redhat, and some refactoring was done to make the existing non_default test area use heredocs so my manifests and test code was kept close together. As apposed to entirely different files and places in the directory structure. I cleaned up the related execs a little bit, adding logoutput => on_failure where needed so we can debug failures. Beforehand execs just 'failed', but now we should be able to get better feedback from failed execs helping support. I also add intention comments in parts of the Puppet code that I touched where it made sense. Signed-off-by: Ken Barber <ken@bob.sh>
52 lines
2 KiB
Puppet
52 lines
2 KiB
Puppet
# puppet-postgresql
|
|
# For all details and documentation:
|
|
# http://github.com/inkling/puppet-postgresql
|
|
#
|
|
# Copyright 2012- Inkling Systems, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
class postgresql::initdb(
|
|
$datadir = $postgresql::params::datadir,
|
|
$encoding = $postgresql::params::charset,
|
|
$group = 'postgres',
|
|
$initdb_path = $postgresql::params::initdb_path,
|
|
$user = 'postgres'
|
|
) inherits postgresql::params {
|
|
# Build up the initdb command.
|
|
#
|
|
# We optionally add the locale switch if specified. Older versions of the
|
|
# initdb command don't accept this switch. So if the user didn't pass the
|
|
# parameter, lets not pass the switch at all.
|
|
$initdb_command = $postgresql::params::locale ? {
|
|
undef => "${initdb_path} --encoding '${encoding}' --pgdata '${datadir}'",
|
|
default => "${initdb_path} --encoding '${encoding}' --pgdata '${datadir}' --locale '${postgresql::params::locale}'"
|
|
}
|
|
|
|
# This runs the initdb command, we use the existance of the PG_VERSION file to
|
|
# ensure we don't keep running this command.
|
|
exec { 'postgresql_initdb':
|
|
command => $initdb_command,
|
|
creates => "${datadir}/PG_VERSION",
|
|
user => $user,
|
|
group => $group,
|
|
logoutput => on_failure,
|
|
}
|
|
|
|
# If we manage the package (which is user configurable) make sure the
|
|
# package exists first.
|
|
if defined(Package[$postgresql::params::server_package_name]) {
|
|
Package[$postgresql::params::server_package_name]->
|
|
Exec['postgresql_initdb']
|
|
}
|
|
}
|