maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #320 from guruevi/master

Browse Source 
Various fixes for failing nginx/LetsEncrypt
This commit is contained in:
Florian Aders
2016-02-22 12:14:12 +01:00
parent deb19f2625 83fd1ab0ca
commit 2286ea751e
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/ssl/class.lescript.php
View File

@@ -324,7 +324,7 @@ keyUsage = nonRepudiation, digitalSignature, keyEncipherment');
{
$res = openssl_pkey_new(array(
"private_key_type" => OPENSSL_KEYTYPE_RSA,
"private_key_bits" => Settings::Get('system.letsencryptkeysize'),
"private_key_bits" => (int)Settings::Get('system.letsencryptkeysize'),
));
if(!openssl_pkey_export($res, $privateKey)) {

4
lib/configfiles/trusty.xml
View File

@@ -273,10 +273,10 @@ fastcgi_param REDIRECT_STATUS 200;
]]>
</content>
</file>
<file name="/etc/nginx/conf.d/acme.conf">
<file name="/etc/nginx/acme.conf">
<content><![CDATA[
location /.well-known/acme-challenge {
alias {{settings.system.letsencryptchallengepath}};
alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;
location ~ /.well-known/acme-challenge/(.*) {
default_type text/plain;