Skip to content

Commit 1cdb444

Browse files
remove manual systemd drop-in file handling
* add puppet/systemd module * remove systemd daemon reload and raise minimal puppet version to 6.1 * remove old "drop-in file" removal, was in place 3 years now * move systemd drop-in file handling to seperate define * Implement recent feedback * define is now private * rename parameter in define call * fix unit tests * fix rubocop complains * fix path, set default fact * fix systemd drop in file, adding template parameters to systemd define * added reason for drop in file in a comment
1 parent d4af1d8 commit 1cdb444

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

manifests/params.pp

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
$service_manage = true
1919
$service_restart_on_change = true
2020
$service_provider = $postgresql::globals::service_provider
21+
$systemd_drop_in_ensure = 'present'
2122
$manage_pg_hba_conf = pick($manage_pg_hba_conf, true)
2223
$manage_pg_ident_conf = pick($manage_pg_ident_conf, true)
2324
$manage_recovery_conf = pick($manage_recovery_conf, false)

manifests/server.pp

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# @param service_provider Overrides the default PostgreSQL service provider.
1616
# @param service_reload Overrides the default reload command for your PostgreSQL service.
1717
# @param service_status Overrides the default status check command for your PostgreSQL service.
18+
# @param systemd_drop_in_ensure sets the Systemd drop-in file to present or absent
1819
# @param default_database Specifies the name of the default database to connect with. On most systems this is 'postgres'.
1920
# @param default_connect_settings Specifies a hash of environment variables used when connecting to a remote server. Becomes the default for other defined types, such as postgresql::server::role.
2021
#
@@ -103,6 +104,7 @@
103104
$service_provider = $postgresql::params::service_provider,
104105
$service_reload = $postgresql::params::service_reload,
105106
$service_status = $postgresql::params::service_status,
107+
Enum[present, absent] $systemd_drop_in_ensure = $postgresql::params::systemd_drop_in_ensure,
106108
$default_database = $postgresql::params::default_database,
107109
$default_connect_settings = $postgresql::globals::default_connect_settings,
108110
$listen_addresses = $postgresql::params::listen_addresses,

manifests/server/instance/config.pp

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
# @param logdir PostgreSQL log directory
3030
# @param service_name Overrides the default PostgreSQL service name.
3131
# @param service_enable Enable the PostgreSQL service
32+
# @param systemd_drop_in_ensure sets the Systemd drop-in file to present or absent
3233
# @param log_line_prefix PostgreSQL log line prefix
3334
# @param timezone Set timezone for the PostgreSQL instance
3435
# @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
@@ -57,6 +58,7 @@
5758
$logdir = $postgresql::server::logdir,
5859
$service_name = $postgresql::server::service_name,
5960
$service_enable = $postgresql::server::service_enable,
61+
Enum[present, absent] $systemd_drop_in_ensure = $postgresql::server::systemd_drop_in_ensure,
6062
$log_line_prefix = $postgresql::server::log_line_prefix,
6163
$timezone = $postgresql::server::timezone,
6264
$password_encryption = $postgresql::server::password_encryption,

0 commit comments

Comments
 (0)