Skip to content

Commit cb01402

Browse files
committed
Makes sure credentials folder exist every time before saving credentials
1 parent 32e5155 commit cb01402

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

backend/internal/certificate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ const internalCertificate = {
789789
logger.info(`Requesting Let'sEncrypt certificates via ${dns_plugin.display_name} for Cert #${certificate.id}: ${certificate.domain_names.join(', ')}`);
790790

791791
const credentials_loc = '/etc/letsencrypt/credentials/credentials-' + certificate.id;
792-
const credentials_cmd = 'echo \'' + certificate.meta.dns_provider_credentials.replace('\'', '\\\'') + '\' > \'' + credentials_loc + '\' && chmod 600 \'' + credentials_loc + '\'';
792+
const credentials_cmd = 'mkdir -p /etc/letsencrypt/credentials 2> /dev/null; echo \'' + certificate.meta.dns_provider_credentials.replace('\'', '\\\'') + '\' > \'' + credentials_loc + '\' && chmod 600 \'' + credentials_loc + '\'';
793793
const prepare_cmd = 'pip3 install ' + dns_plugin.package_name + '==' + dns_plugin.package_version + ' ' + dns_plugin.dependencies;
794794

795795
// Whether the plugin has a --<name>-credentials argument

backend/setup.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ const setupCertbotPlugins = () => {
182182

183183
// Make sure credentials file exists
184184
const credentials_loc = '/etc/letsencrypt/credentials/credentials-' + certificate.id;
185-
const credentials_cmd = '[ -f \'' + credentials_loc + '\' ] || { mkdir /etc/letsencrypt/credentials; echo \'' + certificate.meta.dns_provider_credentials.replace('\'', '\\\'') + '\' > \'' + credentials_loc + '\' && chmod 600 \'' + credentials_loc + '\'; }';
185+
const credentials_cmd = '[ -f \'' + credentials_loc + '\' ] || { mkdir -p /etc/letsencrypt/credentials 2> /dev/null; echo \'' + certificate.meta.dns_provider_credentials.replace('\'', '\\\'') + '\' > \'' + credentials_loc + '\' && chmod 600 \'' + credentials_loc + '\'; }';
186186
promises.push(utils.exec(credentials_cmd));
187187
}
188188
});

docker/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ COPY global /app/global
3838

3939
WORKDIR /app
4040
RUN yarn install
41-
RUN mkdir -p /etc/letsencrypt/credentials
4241

4342
# Remove frontend service not required for prod, dev nginx config as well
4443
RUN rm -rf /etc/services.d/frontend RUN rm -f /etc/nginx/conf.d/dev.conf

docker/dev/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ RUN cd /usr \
1818

1919
COPY rootfs /
2020
RUN rm -f /etc/nginx/conf.d/production.conf
21-
RUN mkdir -p /etc/letsencrypt/credentials
2221

2322
# s6 overlay
2423
RUN curl -L -o /tmp/s6-overlay-amd64.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz" \

0 commit comments

Comments
 (0)