File tree Expand file tree Collapse file tree 3 files changed +1
-38
lines changed Expand file tree Collapse file tree 3 files changed +1
-38
lines changed Original file line number Diff line number Diff line change 192
192
},
193
193
' Debian' => $facts [' os' ][' name' ] ? {
194
194
' Debian' => $facts [' os' ][' release' ][' major' ] ? {
195
- ' 6' => ' 8.4' ,
196
- ' 7' => ' 9.1' ,
197
195
' 8' => ' 9.4' ,
198
196
' 9' => ' 9.6' ,
199
197
' 10' => ' 11' ,
200
198
default => undef ,
201
199
},
202
200
' 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' ,
205
201
/^(14.04)$/ => ' 9.3' ,
206
202
/^(14.10|15.04|15.10)$/ => ' 9.4' ,
207
203
/^(16.04|16.10)$/ => ' 9.5' ,
Original file line number Diff line number Diff line change 97
97
# a systemd override for the port or update the sysconfig file, but this
98
98
# is managed for us in postgresql::server::config.
99
99
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' {
110
101
exec { "postgresql_stop_${name}" :
111
102
command => " service ${postgresql::server::service_name} stop" ,
112
103
onlyif => " service ${postgresql::server::service_name} status" ,
Original file line number Diff line number Diff line change 146
146
require => File [$require_before_initdb ],
147
147
cwd => $module_workdir ,
148
148
}
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
- }
173
149
} elsif $encoding != undef {
174
150
# [workaround]
175
151
# by default pg_createcluster encoding derived from locale
You can’t perform that action at this time.
0 commit comments