File tree Expand file tree Collapse file tree 4 files changed +2
-10
lines changed Expand file tree Collapse file tree 4 files changed +2
-10
lines changed Original file line number Diff line number Diff line change 4
4
$password_hash = false ,
5
5
$createdb = false ,
6
6
$createrole = false ,
7
- $db = $postgresql::server::default_database,
8
7
$port = undef ,
9
8
$login = true ,
10
9
$inherit = true ,
15
14
$connect_settings = $postgresql::server::default_connect_settings,
16
15
Enum['present', 'absent'] $ensure = ' present' ,
17
16
) {
17
+ $psql_db = $postgresql::server::default_database
18
18
$psql_user = $postgresql::server::user
19
19
$psql_group = $postgresql::server::group
20
20
$psql_path = $postgresql::server::psql_path
40
40
}
41
41
42
42
Postgresql_psql {
43
- db => $db ,
43
+ db => $psql_db ,
44
44
port => $port_override ,
45
45
psql_user => $psql_user ,
46
46
psql_group => $psql_group ,
Original file line number Diff line number Diff line change @@ -52,7 +52,6 @@ class { 'postgresql::server': }
52
52
53
53
# Create a role to grant to the user
54
54
postgresql::server::role { $group:
55
- db => $db,
56
55
login => false,
57
56
require => Postgresql::Server::Database[$db],
58
57
}
@@ -106,7 +105,6 @@ class { 'postgresql::server': }
106
105
107
106
# Create a role to grant to the user
108
107
postgresql::server::role { $group:
109
- db => $db,
110
108
login => false,
111
109
require => Postgresql::Server::Database[$db],
112
110
}
@@ -160,7 +158,6 @@ class { 'postgresql::server': }
160
158
161
159
# Create a role to grant to the user
162
160
postgresql::server::role { $group:
163
- db => $db,
164
161
login => false,
165
162
require => Postgresql::Server::Database[$db],
166
163
}
@@ -197,7 +194,6 @@ class { 'postgresql::server': }
197
194
198
195
# Create a role to grant to the nonexistent user
199
196
postgresql::server::role { $group:
200
- db => $db,
201
197
login => false,
202
198
require => Postgresql::Server::Database[$db],
203
199
}
Original file line number Diff line number Diff line change @@ -31,8 +31,6 @@ class { 'postgresql::server': }
31
31
32
32
# Create a user to grant privileges to
33
33
postgresql::server::role { $user:
34
- db => $db,
35
- require => Postgresql::Server::Database[$db],
36
34
}
37
35
38
36
# Make a local user for ident auth
Original file line number Diff line number Diff line change @@ -27,8 +27,6 @@ class { 'postgresql::server': }
27
27
28
28
# Create a user to reassign ownership to
29
29
postgresql::server::role { $new_owner:
30
- db => $db,
31
- require => Postgresql::Server::Database[$db],
32
30
}
33
31
34
32
# Make a local user for ident auth
You can’t perform that action at this time.
0 commit comments