Skip to content

Commit 69c80b4

Browse files
mcanevetbmjen
authored andcommitted
Copy snakeoil certificate and key instead of symlinking
Since postgresql-9.1_9.1.16-0+deb7u1 on wheezy, postgresql can't read snakeoil certificate as symlink anymore, so server does not restart. This patch copies cert and key instead of symlinking so that it works again.
1 parent 1315a33 commit 69c80b4

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

manifests/server/initdb.pp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,25 @@
8383
require => File[$require_before_initdb],
8484
}
8585
# The package will take care of this for us the first time, but if we
86-
# ever need to init a new db we need to make these links explicitly
86+
# ever need to init a new db we need to copy these files explicitly
8787
if $::operatingsystem == 'Debian' or $::operatingsystem == 'Ubuntu' {
8888
if $::operatingsystemrelease =~ /^6/ or $::operatingsystemrelease =~ /^7/ or $::operatingsystemrelease =~ /^10\.04/ or $::operatingsystemrelease =~ /^12\.04/ {
8989
file { 'server.crt':
90-
ensure => link,
90+
ensure => file,
9191
path => "${datadir}/server.crt",
92-
target => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
92+
source => 'file:///etc/ssl/certs/ssl-cert-snakeoil.pem',
93+
owner => $::postgresql::server::user,
94+
group => $::postgresql::server::group,
95+
mode => '0644',
9396
require => Exec['postgresql_initdb'],
9497
}
9598
file { 'server.key':
96-
ensure => link,
99+
ensure => file,
97100
path => "${datadir}/server.key",
98-
target => '/etc/ssl/private/ssl-cert-snakeoil.key',
101+
source => 'file:///etc/ssl/private/ssl-cert-snakeoil.key',
102+
owner => $::postgresql::server::user,
103+
group => $::postgresql::server::group,
104+
mode => '0600',
99105
require => Exec['postgresql_initdb'],
100106
}
101107
}

0 commit comments

Comments
 (0)