Removed references to $postgresql::paths in class params.

This commit is contained in:
Etienne Pelletier 2012-11-29 11:42:38 -06:00 committed by Chris Price
parent ca701b303c
commit db1a34e7ea

View file

@ -39,12 +39,26 @@ class postgresql::config(
$listen_addresses = $postgresql::params::listen_addresses,
$ipv4acls = $postgresql::params::ipv4acls,
$ipv6acls = $postgresql::params::ipv6acls,
$pg_hba_conf_path = $postgresql::paths::pg_hba_conf_path,
$postgresql_conf_path = $postgresql::paths::postgresql_conf_path,
$pg_hba_conf_path = '',
$postgresql_conf_path = '',
$manage_redhat_firewall = $postgresql::params::manage_redhat_firewall
) inherits postgresql::params {
if ! $pg_hba_conf_path {
include postgresql::paths
$pg_hba_conf_path_real = $postgresql::paths::pg_hba_conf_path
}
else {
$pg_hba_conf_path_real = $pg_hba_conf_path
}
if ! $postgresql_conf_path {
include postgresql::paths
$postgresql_conf_path_real = $postgresql::paths::postgresql_conf_path
}
else {
$postgresql_conf_path_real = $postgresql_conf_path
}
# Basically, all this class needs to handle is passing parameters on
# to the "beforeservice" and "afterservice" classes, and ensure
@ -56,8 +70,8 @@ class postgresql::config(
listen_addresses => $listen_addresses,
ipv4acls => $ipv4acls,
ipv6acls => $ipv6acls,
pg_hba_conf_path => $pg_hba_conf_path,
postgresql_conf_path => $postgresql_conf_path,
pg_hba_conf_path => $pg_hba_conf_path_real,
postgresql_conf_path => $postgresql_conf_path_real,
manage_redhat_firewall => $manage_redhat_firewall,
}