Skip to content

Commit ef1681f

Browse files
buzzdeeeMorgan Haskel
authored andcommitted
Changes to support OpenBSD.
Added $service_reload parameter to params.pp, in order to allow a reload of the postgresql server on OpenBSD, which apparently doesn't have a service binary.
1 parent ab98ae3 commit ef1681f

File tree

4 files changed

+33
-1
lines changed

4 files changed

+33
-1
lines changed

manifests/globals.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
default => '9.2',
8686
},
8787
'FreeBSD' => '93',
88+
'OpenBSD' => '9.3',
8889
'Suse' => $::operatingsystem ? {
8990
'SLES' => '91',
9091
default => undef,

manifests/params.pp

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
$psql_path = pick($psql_path, "${bindir}/psql")
6161

6262
$service_status = $service_status
63+
$service_reload = "service ${service_name} reload"
6364
$perl_package_name = pick($perl_package_name, 'perl-DBD-Pg')
6465
$python_package_name = pick($python_package_name, 'python-psycopg2')
6566

@@ -98,6 +99,7 @@
9899
$psql_path = pick($psql_path, "${bindir}/psql")
99100

100101
$service_status = $service_status
102+
$service_reload = "service ${service_name} reload"
101103
$python_package_name = pick($python_package_name, 'python-psycopg2')
102104
# Archlinux does not have a perl::DBD::Pg package
103105
$perl_package_name = pick($perl_package_name, 'undef')
@@ -141,6 +143,7 @@
141143
$datadir = pick($datadir, "/var/lib/postgresql/${version}/main")
142144
$confdir = pick($confdir, "/etc/postgresql/${version}/main")
143145
$service_status = pick($service_status, "/etc/init.d/${service_name} status | /bin/egrep -q 'Running clusters: .+|online'")
146+
$service_reload = "service ${service_name} reload"
144147
$psql_path = pick($psql_path, '/usr/bin/psql')
145148
}
146149

@@ -163,6 +166,31 @@
163166
$datadir = pick($datadir, '/usr/local/pgsql/data')
164167
$confdir = pick($confdir, $datadir)
165168
$service_status = pick($service_status, "/usr/local/etc/rc.d/${service_name} onestatus")
169+
$service_reload = "service ${service_name} reload"
170+
$psql_path = pick($psql_path, "${bindir}/psql")
171+
172+
$needs_initdb = pick($needs_initdb, true)
173+
}
174+
175+
'OpenBSD': {
176+
$user = pick($user, '_postgresql')
177+
$group = pick($group, '_postgresql')
178+
179+
$client_package_name = pick($client_package_name, 'postgresql-client')
180+
$server_package_name = pick($server_package_name, 'postgresql-server')
181+
$contrib_package_name = pick($contrib_package_name, 'postgresql-contrib')
182+
$devel_package_name = pick($devel_package_name, 'postgresql-client')
183+
$java_package_name = pick($java_package_name, 'postgresql-jdbc')
184+
$perl_package_name = pick($perl_package_name, 'databases/p5-DBD-Pg')
185+
$plperl_package_name = undef
186+
$python_package_name = pick($python_package_name, 'py-psycopg2')
187+
188+
$service_name = pick($service_name, 'postgresql')
189+
$bindir = pick($bindir, '/usr/local/bin')
190+
$datadir = pick($datadir, '/var/postgresql/data')
191+
$confdir = pick($confdir, $datadir)
192+
$service_status = pick($service_status, "/etc/rc.d/${service_name} check")
193+
$service_reload = "/etc/rc.d/${service_name} reload"
166194
$psql_path = pick($psql_path, "${bindir}/psql")
167195

168196
$needs_initdb = pick($needs_initdb, true)
@@ -187,6 +215,7 @@
187215
$datadir = pick($datadir, '/var/lib/pgsql/data')
188216
$confdir = pick($confdir, $datadir)
189217
$service_status = pick($service_status, "/etc/init.d/${service_name} status")
218+
$service_reload = "/etc/init.d/${service_name} reload"
190219
$psql_path = pick($psql_path, "${bindir}/psql")
191220

192221
$needs_initdb = pick($needs_initdb, true)

manifests/server.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
$service_manage = $postgresql::params::service_manage,
1414
$service_name = $postgresql::params::service_name,
1515
$service_provider = $postgresql::params::service_provider,
16+
$service_reload = $postgresql::params::service_reload,
1617
$service_status = $postgresql::params::service_status,
1718
$default_database = $postgresql::params::default_database,
1819

manifests/server/reload.pp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
class postgresql::server::reload {
33
$service_name = $postgresql::server::service_name
44
$service_status = $postgresql::server::service_status
5+
$service_reload = $postgresql::server::service_reload
56

67
exec { 'postgresql_reload':
78
path => '/usr/bin:/usr/sbin:/bin:/sbin',
8-
command => "service ${service_name} reload",
9+
command => $service_reload,
910
onlyif => $service_status,
1011
refreshonly => true,
1112
require => Class['postgresql::server::service'],

0 commit comments

Comments
 (0)