version 2.3.1

CHANGELOG.md

@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+version 2.3.1
+-------------
+- Let’s encrypt companion update
+
 version 2.3.0
 -------------
 - Security updates (docker images)

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):

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")

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")

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":