Skip to content

Commit 9bb279b

Browse files
LukasAudLukasAud
committed
testing port
1 parent 192beac commit 9bb279b

File tree

12 files changed

+94
-94
lines changed

12 files changed

+94
-94
lines changed

‎manifests/server.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
String[1] $default_database = $postgresql::params::default_database,
109109
Hash $default_connect_settings = $postgresql::globals::default_connect_settings,
110110
Optional[String[1]] $listen_addresses = $postgresql::params::listen_addresses,
111-
Variant[String[1], Stdlib::Port] $port = $postgresql::params::port,
111+
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::params::port,
112112
String[1] $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user,
113113
String[1] $ip_mask_allow_all_users = $postgresql::params::ip_mask_allow_all_users,
114114
Array[String[1]] $ipv4acls = $postgresql::params::ipv4acls,

‎manifests/server/default_privileges.pp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
/(?i:^TYPES$)/,
2626
/(?i:^SCHEMAS$)/ # lint:ignore:trailing_comma
2727
] $object_type,
28-
String $schema = 'public',
29-
String $psql_db = $postgresql::server::default_database,
30-
String $psql_user = $postgresql::server::user,
31-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
32-
Hash $connect_settings = $postgresql::server::default_connect_settings,
33-
Enum['present', 'absent'] $ensure = 'present',
34-
String $group = $postgresql::server::group,
35-
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
36-
Optional[String] $target_role = undef,
28+
String $schema = 'public',
29+
String $psql_db = $postgresql::server::default_database,
30+
String $psql_user = $postgresql::server::user,
31+
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
32+
Hash $connect_settings = $postgresql::server::default_connect_settings,
33+
Enum['present', 'absent'] $ensure = 'present',
34+
String $group = $postgresql::server::group,
35+
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
36+
Optional[String] $target_role = undef,
3737
) {
3838
# If possible use the version of the remote database, otherwise
3939
# fallback to our local DB version

‎manifests/server/extension.pp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
# @param connect_settings Specifies a hash of environment variables used when connecting to a remote server.
1818
# @param database_resource_name Specifies the resource name of the DB being managed. Defaults to the parameter $database, if left blank.
1919
define postgresql::server::extension (
20-
String[1] $database,
20+
String[1] $database,
2121
Optional[Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]]] $package_ensure = undef,
22-
String[1] $extension = $name,
23-
Optional[String[1]] $schema = undef,
24-
Optional[String[1]] $version = undef,
25-
Enum['present', 'absent'] $ensure = 'present',
26-
Optional[String[1]] $package_name = undef,
27-
Optional[Variant[String[1], Stdlib::Port]] $port = undef,
28-
Hash $connect_settings = postgresql::default('default_connect_settings'),
29-
String[1] $database_resource_name = $database,
22+
String[1] $extension = $name,
23+
Optional[String[1]] $schema = undef,
24+
Optional[String[1]] $version = undef,
25+
Enum['present', 'absent'] $ensure = 'present',
26+
Optional[String[1]] $package_name = undef,
27+
Optional[Variant[String[1], Stdlib::Port, Integer]] $port = undef,
28+
Hash $connect_settings = postgresql::default('default_connect_settings'),
29+
String[1] $database_resource_name = $database,
3030
) {
3131
$user = postgresql::default('user')
3232
$group = postgresql::default('group')

‎manifests/server/grant.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
Array[String[1],0] $object_arguments = [],
3838
String $psql_db = $postgresql::server::default_database,
3939
String $psql_user = $postgresql::server::user,
40-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
40+
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
4141
Boolean $onlyif_exists = false,
4242
Hash $connect_settings = $postgresql::server::default_connect_settings,
4343
Enum['present', 'absent'] $ensure = 'present',

‎manifests/server/grant_role.pp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
# @param port Port to use when connecting.
99
# @param connect_settings Specifies a hash of environment variables used when connecting to a remote server.
1010
define postgresql::server::grant_role (
11-
String[1] $group,
12-
String[1] $role = $name,
13-
Enum['present', 'absent'] $ensure = 'present',
14-
String[1] $psql_db = $postgresql::server::default_database,
15-
String[1] $psql_user = $postgresql::server::user,
16-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
17-
Hash $connect_settings = $postgresql::server::default_connect_settings,
11+
String[1] $group,
12+
String[1] $role = $name,
13+
Enum['present', 'absent'] $ensure = 'present',
14+
String[1] $psql_db = $postgresql::server::default_database,
15+
String[1] $psql_user = $postgresql::server::user,
16+
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
17+
Hash $connect_settings = $postgresql::server::default_connect_settings,
1818
) {
1919
case $ensure {
2020
'present': {

‎manifests/server/instance/config.pp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,33 @@
3535
# @param extra_systemd_config Adds extra config to systemd config file, can for instance be used to add extra openfiles. This can be a multi line string
3636
# lint:endignore:140chars
3737
define postgresql::server::instance::config (
38-
String[1] $ip_mask_deny_postgres_user = $postgresql::server::ip_mask_deny_postgres_user,
39-
String[1] $ip_mask_allow_all_users = $postgresql::server::ip_mask_allow_all_users,
40-
Optional[String[1]] $listen_addresses = $postgresql::server::listen_addresses,
41-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
42-
Array[String[1]] $ipv4acls = $postgresql::server::ipv4acls,
43-
Array[String[1]] $ipv6acls = $postgresql::server::ipv6acls,
44-
Variant[String[1], Stdlib::Absolutepath] $pg_hba_conf_path = $postgresql::server::pg_hba_conf_path,
45-
Variant[String[1], Stdlib::Absolutepath] $pg_ident_conf_path = $postgresql::server::pg_ident_conf_path,
46-
Variant[String[1], Stdlib::Absolutepath] $postgresql_conf_path = $postgresql::server::postgresql_conf_path,
47-
Optional[Stdlib::Filemode] $postgresql_conf_mode = $postgresql::server::postgresql_conf_mode,
48-
Variant[String[1], Stdlib::Absolutepath] $recovery_conf_path = $postgresql::server::recovery_conf_path,
49-
Boolean $pg_hba_conf_defaults = $postgresql::server::pg_hba_conf_defaults,
50-
String[1] $user = $postgresql::server::user,
51-
String[1] $group = $postgresql::server::group,
52-
Optional[String[1]] $version = $postgresql::server::_version,
53-
Boolean $manage_pg_hba_conf = $postgresql::server::manage_pg_hba_conf,
54-
Boolean $manage_pg_ident_conf = $postgresql::server::manage_pg_ident_conf,
55-
Boolean $manage_recovery_conf = $postgresql::server::manage_recovery_conf,
56-
Boolean $manage_postgresql_conf_perms = $postgresql::server::manage_postgresql_conf_perms,
57-
String[1] $datadir = $postgresql::server::datadir,
58-
Optional[String[1]] $logdir = $postgresql::server::logdir,
59-
String[1] $service_name = $postgresql::server::service_name,
60-
Boolean $service_enable = $postgresql::server::service_enable,
61-
Optional[String[1]] $log_line_prefix = $postgresql::server::log_line_prefix,
62-
Optional[String[1]] $timezone = $postgresql::server::timezone,
63-
Optional[String] $password_encryption = $postgresql::server::password_encryption,
64-
String $extra_systemd_config = $postgresql::server::extra_systemd_config,
38+
String[1] $ip_mask_deny_postgres_user = $postgresql::server::ip_mask_deny_postgres_user,
39+
String[1] $ip_mask_allow_all_users = $postgresql::server::ip_mask_allow_all_users,
40+
Optional[String[1]] $listen_addresses = $postgresql::server::listen_addresses,
41+
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
42+
Array[String[1]] $ipv4acls = $postgresql::server::ipv4acls,
43+
Array[String[1]] $ipv6acls = $postgresql::server::ipv6acls,
44+
Variant[String[1], Stdlib::Absolutepath] $pg_hba_conf_path = $postgresql::server::pg_hba_conf_path,
45+
Variant[String[1], Stdlib::Absolutepath] $pg_ident_conf_path = $postgresql::server::pg_ident_conf_path,
46+
Variant[String[1], Stdlib::Absolutepath] $postgresql_conf_path = $postgresql::server::postgresql_conf_path,
47+
Optional[Stdlib::Filemode] $postgresql_conf_mode = $postgresql::server::postgresql_conf_mode,
48+
Variant[String[1], Stdlib::Absolutepath] $recovery_conf_path = $postgresql::server::recovery_conf_path,
49+
Boolean $pg_hba_conf_defaults = $postgresql::server::pg_hba_conf_defaults,
50+
String[1] $user = $postgresql::server::user,
51+
String[1] $group = $postgresql::server::group,
52+
Optional[String[1]] $version = $postgresql::server::_version,
53+
Boolean $manage_pg_hba_conf = $postgresql::server::manage_pg_hba_conf,
54+
Boolean $manage_pg_ident_conf = $postgresql::server::manage_pg_ident_conf,
55+
Boolean $manage_recovery_conf = $postgresql::server::manage_recovery_conf,
56+
Boolean $manage_postgresql_conf_perms = $postgresql::server::manage_postgresql_conf_perms,
57+
String[1] $datadir = $postgresql::server::datadir,
58+
Optional[String[1]] $logdir = $postgresql::server::logdir,
59+
String[1] $service_name = $postgresql::server::service_name,
60+
Boolean $service_enable = $postgresql::server::service_enable,
61+
Optional[String[1]] $log_line_prefix = $postgresql::server::log_line_prefix,
62+
Optional[String[1]] $timezone = $postgresql::server::timezone,
63+
Optional[String] $password_encryption = $postgresql::server::password_encryption,
64+
String $extra_systemd_config = $postgresql::server::extra_systemd_config,
6565
) {
6666
if ($manage_pg_hba_conf == true) {
6767
# Prepare the main pg_hba file

‎manifests/server/instance/late_initdb.pp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
# @param module_workdir Working directory for the PostgreSQL module
99
# lint:endignore:140chars
1010
define postgresql::server::instance::late_initdb (
11-
Optional[String[1]] $encoding = $postgresql::server::encoding,
12-
String[1] $user = $postgresql::server::user,
13-
String[1] $group = $postgresql::server::group,
14-
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
15-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
16-
String[1] $module_workdir = $postgresql::server::module_workdir,
11+
Optional[String[1]] $encoding = $postgresql::server::encoding,
12+
String[1] $user = $postgresql::server::user,
13+
String[1] $group = $postgresql::server::group,
14+
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
15+
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
16+
String[1] $module_workdir = $postgresql::server::module_workdir,
1717
) {
1818
# Set the defaults for the postgresql_psql resource
1919
Postgresql_psql {

‎manifests/server/instance/passwd.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
String[1] $user = $postgresql::server::user,
1313
String[1] $group = $postgresql::server::group,
1414
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
15-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
15+
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
1616
String[1] $database = $postgresql::server::default_database,
1717
String[1] $module_workdir = $postgresql::server::module_workdir,
1818
Optional[Variant[String[1], Sensitive[String[1]], Integer]] $postgres_password = $postgresql::server::postgres_password,

‎manifests/server/instance/service.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Optional[String[1]] $service_provider = $postgresql::server::service_provider,
2121
String[1] $service_status = $postgresql::server::service_status,
2222
String[1] $user = $postgresql::server::user,
23-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
23+
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
2424
String[1] $default_database = $postgresql::server::default_database,
2525
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
2626
Hash $connect_settings = $postgresql::server::default_connect_settings,

‎manifests/server/reassign_owned_by.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
String $old_role,
1313
String $new_role,
1414
String $db,
15-
String $psql_user = $postgresql::server::user,
16-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
17-
Hash $connect_settings = $postgresql::server::default_connect_settings,
15+
String $psql_user = $postgresql::server::user,
16+
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
17+
Hash $connect_settings = $postgresql::server::default_connect_settings,
1818
) {
1919
$sql_command = "REASSIGN OWNED BY \"${old_role}\" TO \"${new_role}\""
2020

0 commit comments

Comments
 (0)