Skip to content

Commit ca4912a

Browse files
committed
drop code for Debian 6/7 and Ubuntu 10.04/12.04
Support for these was dropped in 3d1e1e3 and e61579f, but the code remained.
1 parent 09b242a commit ca4912a

File tree

3 files changed

+1
-38
lines changed

3 files changed

+1
-38
lines changed

manifests/globals.pp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,16 +192,12 @@
192192
},
193193
'Debian' => $facts['os']['name'] ? {
194194
'Debian' => $facts['os']['release']['major'] ? {
195-
'6' => '8.4',
196-
'7' => '9.1',
197195
'8' => '9.4',
198196
'9' => '9.6',
199197
'10' => '11',
200198
default => undef,
201199
},
202200
'Ubuntu' => $facts['os']['release']['major'] ? {
203-
/^(10.04|10.10|11.04)$/ => '8.4',
204-
/^(11.10|12.04|12.10|13.04|13.10)$/ => '9.1',
205201
/^(14.04)$/ => '9.3',
206202
/^(14.10|15.04|15.10)$/ => '9.4',
207203
/^(16.04|16.10)$/ => '9.5',

manifests/server/config_entry.pp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,7 @@
9797
# a systemd override for the port or update the sysconfig file, but this
9898
# is managed for us in postgresql::server::config.
9999
if $facts['os']['name'] == 'Debian' or $facts['os']['name'] == 'Ubuntu' {
100-
if $name == 'port' and $facts['os']['release']['major'] in ['6', '10.04'] {
101-
exec { "postgresql_stop_${name}":
102-
command => "service ${postgresql::server::service_name} stop",
103-
onlyif => "service ${postgresql::server::service_name} status",
104-
unless => "grep 'port = ${value}' ${postgresql::server::postgresql_conf_path}",
105-
path => '/usr/sbin:/sbin:/bin:/usr/bin:/usr/local/bin',
106-
before => Postgresql_conf[$name],
107-
}
108-
}
109-
elsif $name == 'data_directory' {
100+
if $name == 'data_directory' {
110101
exec { "postgresql_stop_${name}":
111102
command => "service ${postgresql::server::service_name} stop",
112103
onlyif => "service ${postgresql::server::service_name} status",

manifests/server/initdb.pp

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -146,30 +146,6 @@
146146
require => File[$require_before_initdb],
147147
cwd => $module_workdir,
148148
}
149-
# The package will take care of this for us the first time, but if we
150-
# ever need to init a new db we need to copy these files explicitly
151-
if $facts['os']['name'] == 'Debian' or $facts['os']['name'] == 'Ubuntu' {
152-
if $facts['os']['release']['major'] in ['6', '7', '10.04', '12.04'] {
153-
file { 'server.crt':
154-
ensure => file,
155-
path => "${datadir}/server.crt",
156-
source => 'file:///etc/ssl/certs/ssl-cert-snakeoil.pem',
157-
owner => $postgresql::server::user,
158-
group => $postgresql::server::group,
159-
mode => '0644',
160-
require => Exec['postgresql_initdb'],
161-
}
162-
file { 'server.key':
163-
ensure => file,
164-
path => "${datadir}/server.key",
165-
source => 'file:///etc/ssl/private/ssl-cert-snakeoil.key',
166-
owner => $postgresql::server::user,
167-
group => $postgresql::server::group,
168-
mode => '0600',
169-
require => Exec['postgresql_initdb'],
170-
}
171-
}
172-
}
173149
} elsif $encoding != undef {
174150
# [workaround]
175151
# by default pg_createcluster encoding derived from locale

0 commit comments

Comments
 (0)