github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

acme_extract -> acme_extract.py + F_BIN to avoid .py

Browse source
This commit is contained in:
NorseGaud 2022-03-06 21:11:46 -05:00
parent 3be5879fcf
commit 1ab8ea96b2
No known key found for this signature in database
GPG key ID: FC3D2A556A94E721
6 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -11,7 +11,7 @@ VCS_VER = $(shell git describe --tags --contains --always)
all: lint build backup generate-accounts tests clean all: lint build backup generate-accounts tests clean
build: build:
docker build --force-rm -t $(NAME) . --build-arg VCS_VER=$(VCS_VER) --build-arg VCS_REF=$(VCS_REF) docker build -t $(NAME) . --build-arg VCS_VER=$(VCS_VER) --build-arg VCS_REF=$(VCS_REF)
backup: backup:
# if backup directories exist, clean hasn't been called, therefore # if backup directories exist, clean hasn't been called, therefore

0
target/bin/acme_extract → target/bin/acme_extract.py
View file

0
target/bin/print-environment Normal file → Executable file
View file

0
target/bin/setup Normal file → Executable file
View file

4
target/scripts/helpers/ssl.sh
View file

@ -418,8 +418,8 @@ function _extract_certs_from_acme
fi fi
local KEY CERT local KEY CERT
KEY=$(acme_extract /etc/letsencrypt/acme.json "${CERT_DOMAIN}" --key) KEY=$(acme_extract.py /etc/letsencrypt/acme.json "${CERT_DOMAIN}" --key)
CERT=$(acme_extract /etc/letsencrypt/acme.json "${CERT_DOMAIN}" --cert) CERT=$(acme_extract.py /etc/letsencrypt/acme.json "${CERT_DOMAIN}" --cert)
if [[ -z ${KEY} ]] || [[ -z ${CERT} ]] if [[ -z ${KEY} ]] || [[ -z ${CERT} ]]
then then

2
test/linting/lint.sh
View file

@ -99,7 +99,7 @@ function _shellcheck
-not -path './target/docker-configomat/*' -not -path './target/docker-configomat/*'
)" )"
# shellcheck disable=SC2248 # shellcheck disable=SC2248
F_BIN="$(grep -l /bin/bash target/bin/*)" F_BIN="$(find 'target/bin' -type f -not -name '*.py')"
F_BATS="$(find 'test' -maxdepth 1 -type f -iname '*.bats')" F_BATS="$(find 'test' -maxdepth 1 -type f -iname '*.bats')"
# This command is a bit easier to grok as multi-line. # This command is a bit easier to grok as multi-line.