Skip to content

Commit 18e7cf6

Browse files
committed
Move the Template uses comment to the actual template
This moves it so it's closer to the actual call to template()
1 parent 3d47832 commit 18e7cf6

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

manifests/server/config.pp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,6 @@
216216
# RHEL 7 and 8 both support drop-in files for systemd units. The old include directive is deprecated and may be removed in future systemd releases.
217217
# Gentoo also supports drop-in files.
218218
if $facts['os']['family'] in ['RedHat', 'Gentoo'] and $facts['service_provider'] == 'systemd' {
219-
# Template uses:
220-
# - $facts['os']['name']
221-
# - $facts['os']['release']['major']
222-
# - $service_name
223-
# - $port
224-
# - $datadir
225-
# - @extra_systemd_config
226-
227219
# While Puppet 6.1 and newer can do a daemon-reload if needed, systemd
228220
# doesn't appear to report that correctly. This is probably because its
229221
# unit file is actually removed.
@@ -244,14 +236,20 @@
244236
group => root,
245237
notify => [Exec['restart-systemd'], Class['postgresql::server::service']],
246238
before => Class['postgresql::server::reload'],
247-
248239
;
249240

250241
'systemd-conf-dir':
251242
ensure => directory,
252243
path => "/etc/systemd/system/${service_name}.service.d",
253244
;
254245

246+
# Template uses:
247+
# - $facts['os']['name']
248+
# - $facts['os']['release']['major']
249+
# - $service_name
250+
# - $port
251+
# - $datadir
252+
# - $extra_systemd_config
255253
'systemd-override':
256254
path => "/etc/systemd/system/${service_name}.service.d/${service_name}.conf",
257255
content => template('postgresql/systemd-override.erb'),

0 commit comments

Comments
 (0)