|
97 | 97 | $python_package_name = pick($python_package_name, 'python-psycopg2') |
98 | 98 | } |
99 | 99 |
|
100 | | - if $postgresql::globals::postgis_package_name { |
101 | | - $postgis_package_name = $postgresql::globals::postgis_package_name |
102 | | - } elsif $facts['os']['release']['major'] == '5' { |
103 | | - $postgis_package_name = 'postgis' |
104 | | - } elsif $postgis_version and versioncmp($postgis_version, '2') < 0 { |
105 | | - $postgis_package_name = "postgis${package_version}" |
106 | | - } else { |
107 | | - $postgis_package_name = "postgis2_${package_version}" |
108 | | - } |
| 100 | + $postgis_package_name = pick($postgresql::globals::postgis_package_name, "postgis2_${package_version}") |
109 | 101 | } |
110 | 102 |
|
111 | 103 | 'Archlinux': { |
|
164 | 156 | $bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin") |
165 | 157 | $datadir = pick($datadir, "/var/lib/postgresql/${version}/main") |
166 | 158 | $confdir = pick($confdir, "/etc/postgresql/${version}/main") |
167 | | - if pick($service_provider, $facts['service_provider']) == 'systemd' { |
168 | | - $service_reload = "systemctl reload ${service_name}" |
169 | | - $service_status = pick($service_status, "systemctl status ${service_name}") |
170 | | - } else { |
171 | | - $service_reload = "service ${service_name} reload" |
172 | | - $service_status = pick($service_status, "service ${service_name} status") |
173 | | - } |
| 159 | + $service_reload = "systemctl reload ${service_name}" |
| 160 | + $service_status = pick($service_status, "systemctl status ${service_name}") |
174 | 161 | $psql_path = pick($psql_path, '/usr/bin/psql') |
175 | 162 | $postgresql_conf_mode = pick($postgresql_conf_mode, '0644') |
176 | 163 | } |
|
264 | 251 | $bindir = pick($bindir, "/usr/lib/postgresql${version}/bin") |
265 | 252 | $datadir = pick($datadir, '/var/lib/pgsql/data') |
266 | 253 | $confdir = pick($confdir, $datadir) |
267 | | - if $facts['os']['name'] == 'SLES' and versioncmp($facts['os']['release']['full'], '11.4') <= 0 { |
268 | | - $service_status = pick($service_status, "/etc/init.d/${service_name} status") |
269 | | - $service_reload = "/etc/init.d/${service_name} reload" |
270 | | - } else { |
271 | | - $service_status = pick($service_status, "systemctl status ${service_name}") |
272 | | - $service_reload = "systemctl reload ${service_name}" |
273 | | - } |
| 254 | + $service_status = pick($service_status, "systemctl status ${service_name}") |
| 255 | + $service_reload = "systemctl reload ${service_name}" |
274 | 256 | $psql_path = pick($psql_path, "${bindir}/psql") |
275 | 257 |
|
276 | 258 | $needs_initdb = pick($needs_initdb, true) |
|
0 commit comments