fix typos

This commit is contained in:
neilpang 2017-06-03 16:52:12 +08:00
parent 76233f2032
commit 9ee4d49cb7
3 changed files with 21 additions and 17 deletions

View file

@ -10,7 +10,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -r /var/lib/apt/lists/*
RUN AUTOUPGRADE=1 LE_WORKING_DIR=/acme.sh LE_CONFIG_HOME /acmecerts wget -O- https://get.acme.sh | sh
RUN AUTOUPGRADE=1 LE_WORKING_DIR=/acme.sh LE_CONFIG_HOME=/acmecerts wget -O- https://get.acme.sh | sh
# Configure Nginx and apply fix for very long server names
RUN echo "daemon off;" >> /etc/nginx/nginx.conf \

View file

@ -106,7 +106,7 @@ server {
{{ $enable_acme := eq (or ($.Env.ENABLE_ACME) "") "true" }}
{{ if $enable_acme }}
#{{ACMD_DOMAINS $host_list}}
#ACME_DOMAINS{{$host_list}}
{{ end }}
# {{ $host }}
upstream {{ $upstream_name }} {

View file

@ -13,7 +13,8 @@ CERTS="/etc/nginx/certs"
updatessl() {
for d_list in $(grep ACMD_DOMAINS $DEFAULT_CONF | cut -d ' ' -f 2);
if grep ACME_DOMAINS $DEFAULT_CONF ; then
for d_list in $(grep ACME_DOMAINS $DEFAULT_CONF | cut -d ' ' -f 2);
do
d=$(echo "$d_list" | cut -d , -f 1)
$ACME_BIN --issue \
@ -29,6 +30,9 @@ updatessl() {
#generate nginx conf again.
docker-gen /app/nginx.tmpl /etc/nginx/conf.d/default.conf
service nginx configtest && service force-reload
else
echo "skip updatessl"
fi
}