diff --git a/Dockerfile b/Dockerfile index 90960a655..da31e697f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -130,7 +130,7 @@ COPY ./docker/entrypoint.sh /entrypoint.sh RUN chmod 775 /entrypoint.sh # Letsencrypt Permissions -RUN mkdir -p /etc/letsencrypt/live/ && chmod 755 /etc/letsencrypt/live/ +RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/ EXPOSE 80 diff --git a/app/workers/certificates.php b/app/workers/certificates.php index f62f089cd..b69462db7 100644 --- a/app/workers/certificates.php +++ b/app/workers/certificates.php @@ -95,19 +95,19 @@ class CertificatesV1 } if(!@rename('/etc/letsencrypt/live/'.$domain->get().'/cert.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/cert.pem')) { - throw new Exception('Failed to copy certificate cert.pem: '.json_encode($response)); + throw new Exception('Failed to rename certificate cert.pem: '.json_encode($response)); } if(!@rename('/etc/letsencrypt/live/'.$domain->get().'/chain.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/chain.pem')) { - throw new Exception('Failed to copy certificate chain.pem: '.json_encode($response)); + throw new Exception('Failed to rename certificate chain.pem: '.json_encode($response)); } if(!@rename('/etc/letsencrypt/live/'.$domain->get().'/fullchain.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/fullchain.pem')) { - throw new Exception('Failed to copy certificate fullchain.pem: '.json_encode($response)); + throw new Exception('Failed to rename certificate fullchain.pem: '.json_encode($response)); } if(!@rename('/etc/letsencrypt/live/'.$domain->get().'/privkey.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/privkey.pem')) { - throw new Exception('Failed to copy certificate privkey.pem: '.json_encode($response)); + throw new Exception('Failed to rename certificate privkey.pem: '.json_encode($response)); } $certificate = array_merge($certificate, [