opuppet/module-postgresql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #633 from b0e/master

Browse source 
disabling pg_hba_conf_defaults should not disable ipv4acls and ipv6ac…
This commit is contained in:
Hunter Haugen 2015-06-25 10:43:08 -07:00
commit cb57b323d6
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
manifests/server/config.pp
View file

@ -69,12 +69,6 @@ class postgresql::server::config {
order => '004', order => '004',
} }
# ipv4acls are passed as an array of rule strings, here we transform
# them into a resources hash, and pass the result to create_resources
$ipv4acl_resources = postgresql_acls_to_resources_hash($ipv4acls,
'ipv4acls', 10)
create_resources('postgresql::server::pg_hba_rule', $ipv4acl_resources)
postgresql::server::pg_hba_rule { 'allow access to all users': postgresql::server::pg_hba_rule { 'allow access to all users':
type => 'host', type => 'host',
address => $ip_mask_allow_all_users, address => $ip_mask_allow_all_users,
@ -87,6 +81,14 @@ class postgresql::server::config {
auth_method => 'md5', auth_method => 'md5',
order => '101', order => '101',
} }
}
# ipv4acls are passed as an array of rule strings, here we transform
# them into a resources hash, and pass the result to create_resources
$ipv4acl_resources = postgresql_acls_to_resources_hash($ipv4acls,
'ipv4acls', 10)
create_resources('postgresql::server::pg_hba_rule', $ipv4acl_resources)
# ipv6acls are passed as an array of rule strings, here we transform # ipv6acls are passed as an array of rule strings, here we transform
# them into a resources hash, and pass the result to create_resources # them into a resources hash, and pass the result to create_resources
@ -94,7 +96,6 @@ class postgresql::server::config {
'ipv6acls', 102) 'ipv6acls', 102)
create_resources('postgresql::server::pg_hba_rule', $ipv6acl_resources) create_resources('postgresql::server::pg_hba_rule', $ipv6acl_resources)
} }
}
# We must set a "listen_addresses" line in the postgresql.conf if we # We must set a "listen_addresses" line in the postgresql.conf if we
# want to allow any connections from remote hosts. # want to allow any connections from remote hosts.