Skip to content

Commit f1d2187

Browse files
gfagfa
committed
Hide passwords from logs and output
1 parent 11dc0df commit f1d2187

File tree

4 files changed

+49
-47
lines changed

4 files changed

+49
-47
lines changed

‎manifests/database/postgresql.pp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Class for creating the PuppetDB postgresql database. See README.md for more
22
# information.
33
class puppetdb::database::postgresql(
4-
$listen_addresses = $puppetdb::params::database_host,
5-
$database_name = $puppetdb::params::database_name,
6-
$database_username = $puppetdb::params::database_username,
7-
$database_password = $puppetdb::params::database_password,
8-
$database_port = $puppetdb::params::database_port,
9-
$manage_database = $puppetdb::params::manage_database,
10-
$manage_server = $puppetdb::params::manage_dbserver,
11-
$manage_package_repo = $puppetdb::params::manage_pg_repo,
12-
$postgres_version = $puppetdb::params::postgres_version,
4+
$listen_addresses = $puppetdb::params::database_host,
5+
$database_name = $puppetdb::params::database_name,
6+
$database_username = $puppetdb::params::database_username,
7+
$database_password = $puppetdb::params::database_password,
8+
$database_port = $puppetdb::params::database_port,
9+
$manage_database = $puppetdb::params::manage_database,
10+
$manage_server = $puppetdb::params::manage_dbserver,
11+
$manage_package_repo = $puppetdb::params::manage_pg_repo,
12+
$postgres_version = $puppetdb::params::postgres_version,
1313
) inherits puppetdb::params {
1414

1515
if $manage_server {

‎manifests/params.pp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424
} else {
2525
$manage_pg_repo = false
2626
}
27-
$postgres_version = '9.6'
27+
$postgres_version = '9.6'
2828

2929
# The remaining database settings are not used for an embedded database
30-
$database_host = 'localhost'
31-
$database_port = '5432'
32-
$database_name = 'puppetdb'
33-
$database_username = 'puppetdb'
34-
$database_password = 'puppetdb'
35-
$manage_db_password = true
36-
$jdbc_ssl_properties = ''
37-
$database_validate = true
38-
$database_max_pool_size = undef
30+
$database_host = 'localhost'
31+
$database_port = '5432'
32+
$database_name = 'puppetdb'
33+
$database_username = 'puppetdb'
34+
$database_password = 'puppetdb'
35+
$manage_db_password = true
36+
$jdbc_ssl_properties = ''
37+
$database_validate = true
38+
$database_max_pool_size = undef
3939

4040
# These settings manage the various auto-deactivation and auto-purge settings
4141
$node_ttl = '7d'

‎manifests/server/database.pp

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
# PRIVATE CLASS - do not use directly
22
class puppetdb::server::database (
3-
$database = $puppetdb::params::database,
4-
$database_host = $puppetdb::params::database_host,
5-
$database_port = $puppetdb::params::database_port,
6-
$database_username = $puppetdb::params::database_username,
7-
$database_password = $puppetdb::params::database_password,
8-
$database_name = $puppetdb::params::database_name,
9-
$manage_db_password = $puppetdb::params::manage_db_password,
10-
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
11-
$database_validate = $puppetdb::params::database_validate,
12-
$database_embedded_path = $puppetdb::params::database_embedded_path,
13-
$node_ttl = $puppetdb::params::node_ttl,
14-
$node_purge_ttl = $puppetdb::params::node_purge_ttl,
15-
$report_ttl = $puppetdb::params::report_ttl,
16-
$facts_blacklist = $puppetdb::params::facts_blacklist,
17-
$gc_interval = $puppetdb::params::gc_interval,
3+
$database = $puppetdb::params::database,
4+
$database_host = $puppetdb::params::database_host,
5+
$database_port = $puppetdb::params::database_port,
6+
$database_username = $puppetdb::params::database_username,
7+
$database_password = $puppetdb::params::database_password,
8+
$database_name = $puppetdb::params::database_name,
9+
$manage_db_password = $puppetdb::params::manage_db_password,
10+
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
11+
$database_validate = $puppetdb::params::database_validate,
12+
$database_embedded_path = $puppetdb::params::database_embedded_path,
13+
$node_ttl = $puppetdb::params::node_ttl,
14+
$node_purge_ttl = $puppetdb::params::node_purge_ttl,
15+
$report_ttl = $puppetdb::params::report_ttl,
16+
$facts_blacklist = $puppetdb::params::facts_blacklist,
17+
$gc_interval = $puppetdb::params::gc_interval,
1818
$node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
19-
$log_slow_statements = $puppetdb::params::log_slow_statements,
20-
$conn_max_age = $puppetdb::params::conn_max_age,
21-
$conn_keep_alive = $puppetdb::params::conn_keep_alive,
22-
$conn_lifetime = $puppetdb::params::conn_lifetime,
23-
$confdir = $puppetdb::params::confdir,
24-
$puppetdb_user = $puppetdb::params::puppetdb_user,
25-
$puppetdb_group = $puppetdb::params::puppetdb_group,
26-
$database_max_pool_size = $puppetdb::params::database_max_pool_size,
27-
$migrate = $puppetdb::params::migrate,
19+
$log_slow_statements = $puppetdb::params::log_slow_statements,
20+
$conn_max_age = $puppetdb::params::conn_max_age,
21+
$conn_keep_alive = $puppetdb::params::conn_keep_alive,
22+
$conn_lifetime = $puppetdb::params::conn_lifetime,
23+
$confdir = $puppetdb::params::confdir,
24+
$puppetdb_user = $puppetdb::params::puppetdb_user,
25+
$puppetdb_group = $puppetdb::params::puppetdb_group,
26+
$database_max_pool_size = $puppetdb::params::database_max_pool_size,
27+
$migrate = $puppetdb::params::migrate,
2828
) inherits puppetdb::params {
2929

3030
if str2bool($database_validate) {
@@ -95,8 +95,9 @@
9595

9696
if $database_password != undef and $manage_db_password {
9797
ini_setting {'puppetdb_psdatabase_password':
98-
setting => 'password',
99-
value => $database_password,
98+
setting => 'password',
99+
value => $database_password,
100+
show_diff => false,
100101
}
101102
}
102103
}

‎manifests/server/read_database.pp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@
8282

8383
if $database_password != undef and $manage_db_password {
8484
ini_setting { 'puppetdb_read_database_password':
85-
setting => 'password',
86-
value => $database_password,
85+
setting => 'password',
86+
value => $database_password,
87+
show_diff => false,
8788
}
8889
}
8990
}

0 commit comments

Comments
 (0)