|
85 | 85 | $postgresql_conf_mode = pick($postgresql_conf_mode, '0600') |
86 | 86 | } |
87 | 87 |
|
88 | | - $service_reload = "systemctl reload ${service_name}" |
89 | 88 | $service_status = pick($service_status, "systemctl status ${service_name}") |
90 | 89 |
|
91 | 90 | $psql_path = pick($psql_path, "${bindir}/psql") |
|
131 | 130 | $psql_path = pick($psql_path, "${bindir}/psql") |
132 | 131 |
|
133 | 132 | $service_status = pick($service_status, "systemctl status ${service_name}") |
134 | | - $service_reload = "systemctl reload ${service_name}" |
135 | 133 | $python_package_name = pick($python_package_name, 'python-psycopg2') |
136 | 134 | # Archlinux does not have a perl::DBD::Pg package |
137 | 135 | $perl_package_name = pick($perl_package_name, 'undef') |
|
172 | 170 | $bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin") |
173 | 171 | $datadir = pick($datadir, "/var/lib/postgresql/${version}/main") |
174 | 172 | $confdir = pick($confdir, "/etc/postgresql/${version}/main") |
175 | | - $service_reload = "systemctl reload ${service_name}" |
176 | 173 | $service_status = pick($service_status, "systemctl status ${service_name}") |
177 | 174 | $psql_path = pick($psql_path, '/usr/bin/psql') |
178 | 175 | $postgresql_conf_mode = pick($postgresql_conf_mode, '0644') |
|
195 | 192 | $datadir = pick($datadir, "/var/lib/postgresql/${version}_data") |
196 | 193 | $confdir = pick($confdir, "/etc/postgresql-${version}") |
197 | 194 | $service_status = pick($service_status, "systemctl status ${service_name}") |
198 | | - $service_reload = "systemctl reload ${service_name}" |
199 | 195 | $psql_path = pick($psql_path, "${bindir}/psql") |
200 | 196 |
|
201 | 197 | $needs_initdb = pick($needs_initdb, true) |
|
219 | 215 | $bindir = pick($bindir, '/usr/local/bin') |
220 | 216 | $confdir = pick($confdir, $datadir) |
221 | 217 | $service_status = pick($service_status, "/usr/local/etc/rc.d/${service_name} onestatus") |
222 | | - $service_reload = "service ${service_name} reload" |
223 | 218 | $psql_path = pick($psql_path, "${bindir}/psql") |
224 | 219 |
|
225 | 220 | $needs_initdb = pick($needs_initdb, true) |
|
243 | 238 | $datadir = pick($datadir, '/var/postgresql/data') |
244 | 239 | $confdir = pick($confdir, $datadir) |
245 | 240 | $service_status = pick($service_status, "/etc/rc.d/${service_name} check") |
246 | | - $service_reload = "/etc/rc.d/${service_name} reload" |
247 | 241 | $psql_path = pick($psql_path, "${bindir}/psql") |
248 | 242 |
|
249 | 243 | $needs_initdb = pick($needs_initdb, true) |
|
268 | 262 | $datadir = pick($datadir, '/var/lib/pgsql/data') |
269 | 263 | $confdir = pick($confdir, $datadir) |
270 | 264 | $service_status = pick($service_status, "systemctl status ${service_name}") |
271 | | - $service_reload = "systemctl reload ${service_name}" |
272 | 265 | $psql_path = pick($psql_path, "${bindir}/psql") |
273 | 266 |
|
274 | 267 | $needs_initdb = pick($needs_initdb, true) |
|
304 | 297 | $postgresql_conf_path = pick($postgresql_conf_path, "${confdir}/postgresql.conf") |
305 | 298 | $recovery_conf_path = pick($recovery_conf_path, "${datadir}/recovery.conf") |
306 | 299 | $default_database = pick($default_database, 'postgres') |
| 300 | + |
| 301 | + $service_reload = if $facts['service_provider'] == 'systemd' { |
| 302 | + "systemctl reload ${service_name}" |
| 303 | + } else { |
| 304 | + "rcctl reload ${service_name}" |
| 305 | + } |
307 | 306 | } |
0 commit comments