From b0f70e90aa8ef90adac45e0f7b11ff466f1e9e09 Mon Sep 17 00:00:00 2001
From: Cyrille Pontvieux <cpontvieux@systra.com>
Date: Mon, 4 Jan 2021 11:17:44 +0100
Subject: [PATCH] version 2.3.1

---
 CHANGELOG.md             | 4 ++++
 capp                     | 2 +-
 dca/dca_keys_entrypoint  | 2 +-
 get_deploy_keys          | 2 +-
 proxy/docker-compose.yml | 4 +++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f37b36..6f85df4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+version 2.3.1
+-------------
+- Let’s encrypt companion update
+
 version 2.3.0
 -------------
 - Security updates (docker images)
diff --git a/capp b/capp
index 8db82e5..3a58671 100755
--- a/capp
+++ b/capp
@@ -54,7 +54,7 @@ from yaml import (
 
 from verify_dca import verify_checksum
 
-__version__ = (2, 3, 0)
+__version__ = (2, 3, 1)
 
 
 def printflush(*args, **kwargs):
diff --git a/dca/dca_keys_entrypoint b/dca/dca_keys_entrypoint
index 764097f..98b0dfe 100755
--- a/dca/dca_keys_entrypoint
+++ b/dca/dca_keys_entrypoint
@@ -7,7 +7,7 @@ Match User dca
     AuthorizedKeysCommandUser dca
 EOF
 cat >> /usr/local/bin/get_dca_keys <<'EOF'
-#!/bin/sh
+#!/bin/bash
 if [ "$1" = "dca" ]; then
   for f in /etc/capp/users/*; do
     u=$(basename "$f")
diff --git a/get_deploy_keys b/get_deploy_keys
index b4a7aaf..1536cc4 100755
--- a/get_deploy_keys
+++ b/get_deploy_keys
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 if [ "$1" = "deploy" ]; then
   for f in /etc/capp/users/*; do
     u=$(basename "$f")
diff --git a/proxy/docker-compose.yml b/proxy/docker-compose.yml
index 5f01d82..808b2b0 100644
--- a/proxy/docker-compose.yml
+++ b/proxy/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       - /var/docker-volumes/nginx-proxy/certs:/etc/nginx/certs:ro
       - nginx-conf:/etc/nginx/conf.d:rw
   letsencrypt:
-    image: jrcs/letsencrypt-nginx-proxy-companion:v1.13.1
+    image: jrcs/letsencrypt-nginx-proxy-companion:2.0.2
     container_name: le-gen
     environment:
       - "NGINX_PROXY_CONTAINER=nginx-proxy"
@@ -37,6 +37,7 @@ services:
       - "network"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
+      - acme:/etc/acme.sh:rw
       - nginx-conf:/etc/nginx/conf.d:rw
       - nginx-html:/usr/share/nginx/html:rw
       - /var/docker-volumes/nginx-proxy/vhost.d:/etc/nginx/vhost.d:rw
@@ -46,3 +47,4 @@ networks:
 volumes:
   "nginx-conf":
   "nginx-html":
+  "acme":