|
85 | 85 | $postgresql_conf_mode = pick($postgresql_conf_mode, '0600') |
86 | 86 | } |
87 | 87 |
|
88 | | - if pick($service_provider, $facts['service_provider']) == 'systemd' { |
89 | | - $service_reload = "systemctl reload ${service_name}" |
90 | | - $service_status = pick($service_status, "systemctl status ${service_name}") |
91 | | - } else { |
92 | | - $service_reload = "service ${service_name} reload" |
93 | | - $service_status = pick($service_status, "service ${service_name} status") |
94 | | - } |
| 88 | + $service_reload = "systemctl reload ${service_name}" |
| 89 | + $service_status = pick($service_status, "systemctl status ${service_name}") |
95 | 90 |
|
96 | 91 | $psql_path = pick($psql_path, "${bindir}/psql") |
97 | 92 |
|
|
104 | 99 |
|
105 | 100 | if $postgresql::globals::postgis_package_name { |
106 | 101 | $postgis_package_name = $postgresql::globals::postgis_package_name |
107 | | - } elsif $facts['os']['release']['major'] == '5' { |
108 | | - $postgis_package_name = 'postgis' |
109 | 102 | } elsif $postgis_version and versioncmp($postgis_version, '2') < 0 { |
110 | 103 | $postgis_package_name = "postgis${package_version}" |
111 | 104 | } else { |
|
169 | 162 | $bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin") |
170 | 163 | $datadir = pick($datadir, "/var/lib/postgresql/${version}/main") |
171 | 164 | $confdir = pick($confdir, "/etc/postgresql/${version}/main") |
172 | | - if pick($service_provider, $facts['service_provider']) == 'systemd' { |
173 | | - $service_reload = "systemctl reload ${service_name}" |
174 | | - $service_status = pick($service_status, "systemctl status ${service_name}") |
175 | | - } else { |
176 | | - $service_reload = "service ${service_name} reload" |
177 | | - $service_status = pick($service_status, "service ${service_name} status") |
178 | | - } |
| 165 | + $service_reload = "systemctl reload ${service_name}" |
| 166 | + $service_status = pick($service_status, "systemctl status ${service_name}") |
179 | 167 | $psql_path = pick($psql_path, '/usr/bin/psql') |
180 | 168 | $postgresql_conf_mode = pick($postgresql_conf_mode, '0644') |
181 | 169 | } |
|
204 | 192 | } |
205 | 193 |
|
206 | 194 | 'FreeBSD': { |
207 | | - case $version { |
208 | | - '94', '95': { |
209 | | - $user = pick($user, 'pgsql') |
210 | | - $group = pick($group, 'pgsql') |
211 | | - $datadir = pick($datadir, '/usr/local/pgsql/data') |
212 | | - } |
213 | | - default: { |
214 | | - $user = pick($user, 'postgres') |
215 | | - $group = pick($group, 'postgres') |
216 | | - $datadir = pick($datadir, "/var/db/postgres/data${version}") |
217 | | - } |
218 | | - } |
| 195 | + $user = pick($user, 'postgres') |
| 196 | + $group = pick($group, 'postgres') |
| 197 | + $datadir = pick($datadir, "/var/db/postgres/data${version}") |
219 | 198 |
|
220 | 199 | $link_pg_config = true |
221 | 200 | $client_package_name = pick($client_package_name, "databases/postgresql${version}-client") |
|
279 | 258 | $bindir = pick($bindir, "/usr/lib/postgresql${version}/bin") |
280 | 259 | $datadir = pick($datadir, '/var/lib/pgsql/data') |
281 | 260 | $confdir = pick($confdir, $datadir) |
282 | | - if $facts['os']['name'] == 'SLES' and versioncmp($facts['os']['release']['full'], '11.4') <= 0 { |
283 | | - $service_status = pick($service_status, "/etc/init.d/${service_name} status") |
284 | | - $service_reload = "/etc/init.d/${service_name} reload" |
285 | | - } else { |
286 | | - $service_status = pick($service_status, "systemctl status ${service_name}") |
287 | | - $service_reload = "systemctl reload ${service_name}" |
288 | | - } |
| 261 | + $service_status = pick($service_status, "systemctl status ${service_name}") |
| 262 | + $service_reload = "systemctl reload ${service_name}" |
289 | 263 | $psql_path = pick($psql_path, "${bindir}/psql") |
290 | 264 |
|
291 | 265 | $needs_initdb = pick($needs_initdb, true) |
|
0 commit comments