Skip to content

Commit

Permalink
Correct domains.conf parsing with wildcard domains in the last line o…
Browse files Browse the repository at this point in the history
…f the file.
  • Loading branch information
Adrien Ferrand committed Aug 8, 2018
1 parent 7f31266 commit b5d92f8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#  ![](https://raw.githubusercontent.com/adferrand/docker-letsencrypt-dns/master/images/logo_from_realies_200px.png) adferrand/letsencrypt-dns
![](https://img.shields.io/badge/tags-latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/letsencrypt-dns:2.5.0.svg) ![](https://images.microbadger.com/badges/image/adferrand/letsencrypt-dns:2.5.0.svg)](https://microbadger.com/images/adferrand/letsencrypt-dns:2.5.0)
![](https://img.shields.io/badge/tags-latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/letsencrypt-dns:2.5.1.svg) ![](https://images.microbadger.com/badges/image/adferrand/letsencrypt-dns:2.5.1.svg)](https://microbadger.com/images/adferrand/letsencrypt-dns:2.5.1)

* [Container functionalities](#container-functionalities)
* [Why use this Docker](#why-use-this-docker-)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.0
2.5.1
4 changes: 2 additions & 2 deletions files/watch-domains.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ while true; do
certbot register -n --agree-tos -m $LETSENCRYPT_USER_MAIL $server_cmd

echo "#### Creating missing certificates if needed (~1min for each) ####"
while entry=; IFS=$'\n\r' read -r entry || [[ $entry ]]; do
while read -r entry || [ -n "$entry" ]; do
autorestart_config=`echo $entry | grep -E -o 'autorestart-containers=.*' | sed 's/autocmd-containers=.*//' | sed 's/autorestart-containers=//' | xargs`
autocmd_config=`echo $entry | grep -E -o 'autocmd-containers=.*' | sed 's/autorestart-containers=.*//' | sed 's/autocmd-containers=//' | xargs`
clean_domains=`echo $entry | sed 's/autorestart-containers=.*//' | sed 's/autocmd-containers=.*//' | xargs`
Expand Down Expand Up @@ -77,7 +77,7 @@ while true; do
echo "### Revoke and delete certificates if needed ####"
for domain in `ls /etc/letsencrypt/live`; do
remove_domain=true
while entry=; IFS=$'\n\r' read -r entry || [[ $entry ]]; do
while read -r entry || [ -n "$entry" ]; do
for comp_domain in $entry; do
if [ "$domain" = "${comp_domain/\*\./}" ]; then
remove_domain=false
Expand Down

0 comments on commit b5d92f8

Please sign in to comment.