aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMax Mack <maximilian.mack@dozeo.com>2013-04-02 12:26:41 +0300
committerMax Mack <maximilian.mack@dozeo.com>2013-04-02 12:26:41 +0300
commit4bd0f6d89188af32e392a668798f9ade286935f1 (patch)
treed717a6a64b33c220978943738f4577da6b8c83b5 /config
parentfdb500d70615697c453b18d5cae0ff78dfd31c70 (diff)
downloadpfsense-packages-4bd0f6d89188af32e392a668798f9ade286935f1.tar.gz
pfsense-packages-4bd0f6d89188af32e392a668798f9ade286935f1.tar.bz2
pfsense-packages-4bd0f6d89188af32e392a668798f9ade286935f1.zip
Add newline at cert concat
I got an error that haproxy can't load the cert. I looked into it and saw that the two parts are concationated together without a newline. Wrong: -----END CERTIFICATE----------BEGIN RSA PRIVATE KEY----- Correct: -----END CERTIFICATE-----\r\n -----BEGIN RSA PRIVATE KEY----- It works for me now...
Diffstat (limited to 'config')
-rw-r--r--config/haproxy-devel/haproxy.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index f949bf98..427b0418 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -524,7 +524,7 @@ function haproxy_writeconf() {
//ssl crt ./server.pem ca-file ./ca.crt verify optional crt-ignore-err all crl-file ./ca_crl.pem
$ssl_crt=" crt /var/etc/{$backend['name']}.{$backend['port']}.crt";
$cert = lookup_cert($backend['ssloffloadcert']);
- $certcontent = base64_decode($cert['crt']).base64_decode($cert['prv']);
+ $certcontent = base64_decode($cert['crt'])."\r\n".base64_decode($cert['prv']);
file_put_contents("/var/etc/{$backend['name']}.{$backend['port']}.crt", $certcontent);
unset($certcontent);
}else{