Skip to content

Commit 86bcdf1

Browse files
committed
small fix
1 parent 9bb279b commit 86bcdf1

File tree

9 files changed

+58
-58
lines changed

9 files changed

+58
-58
lines changed

manifests/client.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
Enum['file', 'absent'] $file_ensure = 'file',
1616
Stdlib::Absolutepath $validcon_script_path = $postgresql::params::validcon_script_path,
1717
String[1] $package_name = $postgresql::params::client_package_name,
18-
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
18+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present',
1919
) inherits postgresql::params {
2020
if $package_name != 'UNSET' {
2121
package { 'postgresql-client':

manifests/lib/devel.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class postgresql::lib::devel (
1212
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present',
1313
String $package_name = $postgresql::params::devel_package_name,
14-
Boolean $link_pg_config = $postgresql::params::link_pg_config
14+
Boolean $link_pg_config = $postgresql::params::link_pg_config,
1515
) inherits postgresql::params {
1616
if $facts['os']['family'] == 'Gentoo' {
1717
fail('osfamily Gentoo does not have a separate "devel" package, postgresql::lib::devel is not supported')

manifests/lib/java.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
class postgresql::lib::java (
1212
String $package_name = $postgresql::params::java_package_name,
13-
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
13+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present',
1414
) inherits postgresql::params {
1515
package { 'postgresql-jdbc':
1616
ensure => $package_ensure,

manifests/lib/perl.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
class postgresql::lib::perl (
99
String $package_name = $postgresql::params::perl_package_name,
10-
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
10+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present',
1111
) inherits postgresql::params {
1212
package { 'perl-DBD-Pg':
1313
ensure => $package_ensure,

manifests/lib/python.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
class postgresql::lib::python (
99
String[1] $package_name = $postgresql::params::python_package_name,
10-
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
10+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present',
1111
) inherits postgresql::params {
1212
package { 'python-psycopg2':
1313
ensure => $package_ensure,

manifests/server.pp

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -92,27 +92,27 @@
9292
Optional[Variant[String[1], Sensitive[String[1]], Integer]] $postgres_password = undef,
9393

9494
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = $postgresql::params::package_ensure,
95-
String[1] $package_name = $postgresql::params::server_package_name,
96-
97-
Optional[String[1]] $plperl_package_name = $postgresql::params::plperl_package_name,
98-
Optional[String[1]] $plpython_package_name = $postgresql::params::plpython_package_name,
99-
100-
Variant[Enum['running', 'stopped'], Boolean] $service_ensure = $postgresql::params::service_ensure,
101-
Boolean $service_enable = $postgresql::params::service_enable,
102-
Boolean $service_manage = $postgresql::params::service_manage,
103-
String[1] $service_name = $postgresql::params::service_name,
104-
Boolean $service_restart_on_change = $postgresql::params::service_restart_on_change,
105-
Optional[String[1]] $service_provider = $postgresql::params::service_provider,
106-
String[1] $service_reload = $postgresql::params::service_reload,
107-
String[1] $service_status = $postgresql::params::service_status,
108-
String[1] $default_database = $postgresql::params::default_database,
109-
Hash $default_connect_settings = $postgresql::globals::default_connect_settings,
110-
Optional[String[1]] $listen_addresses = $postgresql::params::listen_addresses,
111-
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::params::port,
112-
String[1] $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user,
113-
String[1] $ip_mask_allow_all_users = $postgresql::params::ip_mask_allow_all_users,
114-
Array[String[1]] $ipv4acls = $postgresql::params::ipv4acls,
115-
Array[String[1]] $ipv6acls = $postgresql::params::ipv6acls,
95+
String[1] $package_name = $postgresql::params::server_package_name,
96+
97+
Optional[String[1]] $plperl_package_name = $postgresql::params::plperl_package_name,
98+
Optional[String[1]] $plpython_package_name = $postgresql::params::plpython_package_name,
99+
100+
Variant[Enum['running', 'stopped'], Boolean] $service_ensure = $postgresql::params::service_ensure,
101+
Boolean $service_enable = $postgresql::params::service_enable,
102+
Boolean $service_manage = $postgresql::params::service_manage,
103+
String[1] $service_name = $postgresql::params::service_name,
104+
Boolean $service_restart_on_change = $postgresql::params::service_restart_on_change,
105+
Optional[String[1]] $service_provider = $postgresql::params::service_provider,
106+
String[1] $service_reload = $postgresql::params::service_reload,
107+
String[1] $service_status = $postgresql::params::service_status,
108+
String[1] $default_database = $postgresql::params::default_database,
109+
Hash $default_connect_settings = $postgresql::globals::default_connect_settings,
110+
Optional[String[1]] $listen_addresses = $postgresql::params::listen_addresses,
111+
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::params::port,
112+
String[1] $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user,
113+
String[1] $ip_mask_allow_all_users = $postgresql::params::ip_mask_allow_all_users,
114+
Array[String[1]] $ipv4acls = $postgresql::params::ipv4acls,
115+
Array[String[1]] $ipv6acls = $postgresql::params::ipv6acls,
116116

117117
Variant[String[1], Stdlib::Absolutepath] $initdb_path = $postgresql::params::initdb_path,
118118
Optional[Variant[String[1], Stdlib::Absolutepath]] $createdb_path = $postgresql::params::createdb_path,
@@ -123,44 +123,44 @@
123123
Optional[Stdlib::Filemode] $postgresql_conf_mode = $postgresql::params::postgresql_conf_mode,
124124
Variant[String[1], Stdlib::Absolutepath] $recovery_conf_path = $postgresql::params::recovery_conf_path,
125125

126-
String[1] $datadir = $postgresql::params::datadir,
127-
Optional[String[1]] $xlogdir = $postgresql::params::xlogdir,
128-
Optional[String[1]] $logdir = $postgresql::params::logdir,
126+
String[1] $datadir = $postgresql::params::datadir,
127+
Optional[String[1]] $xlogdir = $postgresql::params::xlogdir,
128+
Optional[String[1]] $logdir = $postgresql::params::logdir,
129129

130-
Optional[String[1]] $log_line_prefix = $postgresql::params::log_line_prefix,
130+
Optional[String[1]] $log_line_prefix = $postgresql::params::log_line_prefix,
131131

132-
Boolean $pg_hba_conf_defaults = $postgresql::params::pg_hba_conf_defaults,
132+
Boolean $pg_hba_conf_defaults = $postgresql::params::pg_hba_conf_defaults,
133133

134-
String[1] $user = $postgresql::params::user,
135-
String[1] $group = $postgresql::params::group,
134+
String[1] $user = $postgresql::params::user,
135+
String[1] $group = $postgresql::params::group,
136136

137-
Boolean $needs_initdb = $postgresql::params::needs_initdb,
137+
Boolean $needs_initdb = $postgresql::params::needs_initdb,
138138

139-
Optional[String[1]] $encoding = $postgresql::params::encoding,
140-
Optional[String[1]] $locale = $postgresql::params::locale,
141-
Optional[String[1]] $data_checksums = $postgresql::params::data_checksums,
142-
Optional[String[1]] $timezone = $postgresql::params::timezone,
139+
Optional[String[1]] $encoding = $postgresql::params::encoding,
140+
Optional[String[1]] $locale = $postgresql::params::locale,
141+
Optional[String[1]] $data_checksums = $postgresql::params::data_checksums,
142+
Optional[String[1]] $timezone = $postgresql::params::timezone,
143143

144-
Boolean $manage_pg_hba_conf = $postgresql::params::manage_pg_hba_conf,
145-
Boolean $manage_pg_ident_conf = $postgresql::params::manage_pg_ident_conf,
146-
Boolean $manage_recovery_conf = $postgresql::params::manage_recovery_conf,
147-
Boolean $manage_postgresql_conf_perms = $postgresql::params::manage_postgresql_conf_perms,
148-
Boolean $manage_selinux = $postgresql::params::manage_selinux,
149-
String[1] $module_workdir = $postgresql::params::module_workdir,
144+
Boolean $manage_pg_hba_conf = $postgresql::params::manage_pg_hba_conf,
145+
Boolean $manage_pg_ident_conf = $postgresql::params::manage_pg_ident_conf,
146+
Boolean $manage_recovery_conf = $postgresql::params::manage_recovery_conf,
147+
Boolean $manage_postgresql_conf_perms = $postgresql::params::manage_postgresql_conf_perms,
148+
Boolean $manage_selinux = $postgresql::params::manage_selinux,
149+
String[1] $module_workdir = $postgresql::params::module_workdir,
150150

151-
Boolean $manage_datadir = $postgresql::params::manage_datadir,
152-
Boolean $manage_logdir = $postgresql::params::manage_logdir,
153-
Boolean $manage_xlogdir = $postgresql::params::manage_xlogdir,
154-
Optional[String] $password_encryption = $postgresql::params::password_encryption,
155-
String $extra_systemd_config = $postgresql::params::extra_systemd_config,
151+
Boolean $manage_datadir = $postgresql::params::manage_datadir,
152+
Boolean $manage_logdir = $postgresql::params::manage_logdir,
153+
Boolean $manage_xlogdir = $postgresql::params::manage_xlogdir,
154+
Optional[String] $password_encryption = $postgresql::params::password_encryption,
155+
String $extra_systemd_config = $postgresql::params::extra_systemd_config,
156156

157-
Hash[String, Hash] $roles = {},
158-
Hash[String, Any] $config_entries = {},
159-
Postgresql::Pg_hba_rules $pg_hba_rules = {},
157+
Hash[String, Hash] $roles = {},
158+
Hash[String, Any] $config_entries = {},
159+
Postgresql::Pg_hba_rules $pg_hba_rules = {},
160160

161-
Boolean $backup_enable = $postgresql::params::backup_enable,
162-
Hash $backup_options = {},
163-
Enum['pg_dump'] $backup_provider = $postgresql::params::backup_provider,
161+
Boolean $backup_enable = $postgresql::params::backup_enable,
162+
Hash $backup_options = {},
163+
Enum['pg_dump'] $backup_provider = $postgresql::params::backup_provider,
164164

165165
#Deprecated
166166
Optional[String[1]] $version = undef,

manifests/server/contrib.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Ensure the contrib package is installed.
77
class postgresql::server::contrib (
88
Optional[String[1]] $package_name = $postgresql::params::contrib_package_name,
9-
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
9+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present',
1010
) inherits postgresql::params {
1111
if $package_name {
1212
package { 'postgresql-contrib':

manifests/server/plperl.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# @param package_name The name of the PostgreSQL PL/Perl package.
55
class postgresql::server::plperl (
66
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present',
7-
Optional[String[1]] $package_name = $postgresql::server::plperl_package_name
7+
Optional[String[1]] $package_name = $postgresql::server::plperl_package_name,
88
) {
99
package { 'postgresql-plperl':
1010
ensure => $package_ensure,

manifests/server/postgis.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# @param package_ensure Specifies if the package is present or not.
55
class postgresql::server::postgis (
66
String $package_name = $postgresql::params::postgis_package_name,
7-
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
7+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present',
88
) inherits postgresql::params {
99
package { 'postgresql-postgis':
1010
ensure => $package_ensure,

0 commit comments

Comments
 (0)