Skip to content

Commit 54556b0

Browse files
committed
move class database::postgresql parameter reference to pp
1 parent 3aa0a20 commit 54556b0

File tree

3 files changed

+70
-65
lines changed

3 files changed

+70
-65
lines changed

README.md

-40
Original file line numberDiff line numberDiff line change
@@ -393,46 +393,6 @@ creating and managing the PuppetDB database and database user accounts.
393393
listen_addresses => 'my.postgres.host.name',
394394
}
395395

396-
#### `listen_addresses`
397-
398-
The `listen_address` is a comma-separated list of hostnames or IP addresses on
399-
which the postgres server should listen for incoming connections. This defaults
400-
to `localhost`. This parameter maps directly to PostgreSQL's `listen_addresses`
401-
config option. Use a `*` to allow connections on any accessible address.
402-
403-
#### `database_name`
404-
405-
Sets the name of the database. Defaults to `puppetdb`.
406-
407-
#### `database_username`
408-
409-
Creates a user for access the database. Defaults to `puppetdb`.
410-
411-
#### `database_password`
412-
413-
Sets the password for the database user above. Defaults to `puppetdb`.
414-
415-
#### `manage_server`
416-
417-
Conditionally manages the PostgreSQL server via `postgresql::server`. Defaults
418-
to `true`. If set to `false`, this class will create the database and user via
419-
`postgresql::server::db` but not attempt to install or manage the server itself.
420-
421-
#### `test_url`
422-
423-
The URL to use for testing if the PuppetDB instance is running. Defaults to
424-
`/pdb/meta/v1/version`.
425-
426-
#### `manage_package_repo`
427-
428-
If `true`, the official postgresql.org repo will be added and postgres won't
429-
be installed from the regular repository. Defaults to `true`.
430-
431-
#### `postgres_version`
432-
433-
If the postgresql.org repo is installed, you can install several versions of
434-
postgres. Defaults to `11` with PuppetDB version 7.0.0 or newer, and `9.6` in older versions.
435-
436396
Implementation
437397
---------------
438398

REFERENCE.md

+38-25
Original file line numberDiff line numberDiff line change
@@ -953,15 +953,16 @@ create the PuppetDB postgresql database
953953
The following parameters are available in the `puppetdb::database::postgresql` class:
954954

955955
* [`listen_addresses`](#-puppetdb--database--postgresql--listen_addresses)
956-
* [`puppetdb_server`](#-puppetdb--database--postgresql--puppetdb_server)
957956
* [`database_name`](#-puppetdb--database--postgresql--database_name)
958957
* [`database_username`](#-puppetdb--database--postgresql--database_username)
959958
* [`database_password`](#-puppetdb--database--postgresql--database_password)
960-
* [`database_port`](#-puppetdb--database--postgresql--database_port)
961-
* [`manage_database`](#-puppetdb--database--postgresql--manage_database)
962959
* [`manage_server`](#-puppetdb--database--postgresql--manage_server)
960+
* [`test_url`](#-puppetdb--database--postgresql--test_url)
963961
* [`manage_package_repo`](#-puppetdb--database--postgresql--manage_package_repo)
964962
* [`postgres_version`](#-puppetdb--database--postgresql--postgres_version)
963+
* [`puppetdb_server`](#-puppetdb--database--postgresql--puppetdb_server)
964+
* [`database_port`](#-puppetdb--database--postgresql--database_port)
965+
* [`manage_database`](#-puppetdb--database--postgresql--manage_database)
965966
* [`postgresql_ssl_on`](#-puppetdb--database--postgresql--postgresql_ssl_on)
966967
* [`postgresql_ssl_key_path`](#-puppetdb--database--postgresql--postgresql_ssl_key_path)
967968
* [`postgresql_ssl_cert_path`](#-puppetdb--database--postgresql--postgresql_ssl_cert_path)
@@ -974,81 +975,93 @@ The following parameters are available in the `puppetdb::database::postgresql` c
974975

975976
Data type: `Any`
976977

977-
978+
The `listen_address` is a comma-separated list of hostnames or IP addresses on
979+
which the postgres server should listen for incoming connections. This defaults
980+
to `localhost`. This parameter maps directly to PostgreSQL's `listen_addresses`
981+
config option. Use a `*` to allow connections on any accessible address.
978982

979983
Default value: `$puppetdb::params::database_host`
980984

981-
##### <a name="-puppetdb--database--postgresql--puppetdb_server"></a>`puppetdb_server`
982-
983-
Data type: `Any`
984-
985-
986-
987-
Default value: `$puppetdb::params::puppetdb_server`
988-
989985
##### <a name="-puppetdb--database--postgresql--database_name"></a>`database_name`
990986

991987
Data type: `Any`
992988

993-
989+
Sets the name of the database. Defaults to `puppetdb`.
994990

995991
Default value: `$puppetdb::params::database_name`
996992

997993
##### <a name="-puppetdb--database--postgresql--database_username"></a>`database_username`
998994

999995
Data type: `Any`
1000996

1001-
997+
Creates a user for access the database. Defaults to `puppetdb`.
1002998

1003999
Default value: `$puppetdb::params::database_username`
10041000

10051001
##### <a name="-puppetdb--database--postgresql--database_password"></a>`database_password`
10061002

10071003
Data type: `Any`
10081004

1009-
1005+
Sets the password for the database user above. Defaults to `puppetdb`.
10101006

10111007
Default value: `$puppetdb::params::database_password`
10121008

1013-
##### <a name="-puppetdb--database--postgresql--database_port"></a>`database_port`
1009+
##### <a name="-puppetdb--database--postgresql--manage_server"></a>`manage_server`
10141010

10151011
Data type: `Any`
10161012

1013+
Conditionally manages the PostgreSQL server via `postgresql::server`. Defaults
1014+
to `true`. If set to `false`, this class will create the database and user via
1015+
`postgresql::server::db` but not attempt to install or manage the server itself.
10171016

1017+
Default value: `$puppetdb::params::manage_dbserver`
10181018

1019-
Default value: `$puppetdb::params::database_port`
1019+
##### <a name="-puppetdb--database--postgresql--test_url"></a>`test_url`
10201020

1021-
##### <a name="-puppetdb--database--postgresql--manage_database"></a>`manage_database`
1021+
The URL to use for testing if the PuppetDB instance is running. Defaults to
1022+
`/pdb/meta/v1/version`.
1023+
1024+
##### <a name="-puppetdb--database--postgresql--manage_package_repo"></a>`manage_package_repo`
10221025

10231026
Data type: `Any`
10241027

1028+
If `true`, the official postgresql.org repo will be added and postgres won't
1029+
be installed from the regular repository. Defaults to `true`.
10251030

1031+
Default value: `$puppetdb::params::manage_pg_repo`
10261032

1027-
Default value: `$puppetdb::params::manage_database`
1033+
##### <a name="-puppetdb--database--postgresql--postgres_version"></a>`postgres_version`
10281034

1029-
##### <a name="-puppetdb--database--postgresql--manage_server"></a>`manage_server`
1035+
Data type: `Any`
1036+
1037+
If the postgresql.org repo is installed, you can install several versions of
1038+
postgres. Defaults to `11` with PuppetDB version 7.0.0 or newer, and `9.6` in older versions.
1039+
1040+
Default value: `$puppetdb::params::postgres_version`
1041+
1042+
##### <a name="-puppetdb--database--postgresql--puppetdb_server"></a>`puppetdb_server`
10301043

10311044
Data type: `Any`
10321045

10331046

10341047

1035-
Default value: `$puppetdb::params::manage_dbserver`
1048+
Default value: `$puppetdb::params::puppetdb_server`
10361049

1037-
##### <a name="-puppetdb--database--postgresql--manage_package_repo"></a>`manage_package_repo`
1050+
##### <a name="-puppetdb--database--postgresql--database_port"></a>`database_port`
10381051

10391052
Data type: `Any`
10401053

10411054

10421055

1043-
Default value: `$puppetdb::params::manage_pg_repo`
1056+
Default value: `$puppetdb::params::database_port`
10441057

1045-
##### <a name="-puppetdb--database--postgresql--postgres_version"></a>`postgres_version`
1058+
##### <a name="-puppetdb--database--postgresql--manage_database"></a>`manage_database`
10461059

10471060
Data type: `Any`
10481061

10491062

10501063

1051-
Default value: `$puppetdb::params::postgres_version`
1064+
Default value: `$puppetdb::params::manage_database`
10521065

10531066
##### <a name="-puppetdb--database--postgresql--postgresql_ssl_on"></a>`postgresql_ssl_on`
10541067

manifests/database/postgresql.pp

+32
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
# create the PuppetDB postgresql database
22
#
3+
# @param listen_addresses
4+
# The `listen_address` is a comma-separated list of hostnames or IP addresses on
5+
# which the postgres server should listen for incoming connections. This defaults
6+
# to `localhost`. This parameter maps directly to PostgreSQL's `listen_addresses`
7+
# config option. Use a `*` to allow connections on any accessible address.
8+
#
9+
# @param database_name
10+
# Sets the name of the database. Defaults to `puppetdb`.
11+
#
12+
# @param database_username
13+
# Creates a user for access the database. Defaults to `puppetdb`.
14+
#
15+
# @param database_password
16+
# Sets the password for the database user above. Defaults to `puppetdb`.
17+
#
18+
# @param manage_server
19+
# Conditionally manages the PostgreSQL server via `postgresql::server`. Defaults
20+
# to `true`. If set to `false`, this class will create the database and user via
21+
# `postgresql::server::db` but not attempt to install or manage the server itself.
22+
#
23+
# @param test_url
24+
# The URL to use for testing if the PuppetDB instance is running. Defaults to
25+
# `/pdb/meta/v1/version`.
26+
#
27+
# @param manage_package_repo
28+
# If `true`, the official postgresql.org repo will be added and postgres won't
29+
# be installed from the regular repository. Defaults to `true`.
30+
#
31+
# @param postgres_version
32+
# If the postgresql.org repo is installed, you can install several versions of
33+
# postgres. Defaults to `11` with PuppetDB version 7.0.0 or newer, and `9.6` in older versions.
34+
#
335
class puppetdb::database::postgresql (
436
$listen_addresses = $puppetdb::params::database_host,
537
$puppetdb_server = $puppetdb::params::puppetdb_server,

0 commit comments

Comments
 (0)