|
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 |
|
|
102 | 97 | $python_package_name = pick($python_package_name, 'python-psycopg2')
|
103 | 98 | }
|
104 | 99 |
|
105 |
| - if $postgresql::globals::postgis_package_name { |
106 |
| - $postgis_package_name = $postgresql::globals::postgis_package_name |
107 |
| - } elsif $facts['os']['release']['major'] == '5' { |
108 |
| - $postgis_package_name = 'postgis' |
109 |
| - } elsif $postgis_version and versioncmp($postgis_version, '2') < 0 { |
110 |
| - $postgis_package_name = "postgis${package_version}" |
111 |
| - } else { |
112 |
| - $postgis_package_name = "postgis2_${package_version}" |
113 |
| - } |
| 100 | + $postgis_package_name = pick($postgresql::globals::postgis_package_name, "postgis2_${package_version}") |
114 | 101 | }
|
115 | 102 |
|
116 | 103 | 'Archlinux': {
|
|
169 | 156 | $bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin")
|
170 | 157 | $datadir = pick($datadir, "/var/lib/postgresql/${version}/main")
|
171 | 158 | $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 |
| - } |
| 159 | + $service_reload = "systemctl reload ${service_name}" |
| 160 | + $service_status = pick($service_status, "systemctl status ${service_name}") |
179 | 161 | $psql_path = pick($psql_path, '/usr/bin/psql')
|
180 | 162 | $postgresql_conf_mode = pick($postgresql_conf_mode, '0644')
|
181 | 163 | }
|
|
204 | 186 | }
|
205 | 187 |
|
206 | 188 | '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 |
| - } |
| 189 | + $user = pick($user, 'postgres') |
| 190 | + $group = pick($group, 'postgres') |
| 191 | + $datadir = pick($datadir, "/var/db/postgres/data${version}") |
219 | 192 |
|
220 | 193 | $link_pg_config = true
|
221 | 194 | $client_package_name = pick($client_package_name, "databases/postgresql${version}-client")
|
|
279 | 252 | $bindir = pick($bindir, "/usr/lib/postgresql${version}/bin")
|
280 | 253 | $datadir = pick($datadir, '/var/lib/pgsql/data')
|
281 | 254 | $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 |
| - } |
| 255 | + $service_status = pick($service_status, "systemctl status ${service_name}") |
| 256 | + $service_reload = "systemctl reload ${service_name}" |
289 | 257 | $psql_path = pick($psql_path, "${bindir}/psql")
|
290 | 258 |
|
291 | 259 | $needs_initdb = pick($needs_initdb, true)
|
|
0 commit comments