From 2fb2021b902068722b2f2da9d7cfbca54925e2b2 Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Tue, 17 Sep 2024 11:32:13 +0200 Subject: [PATCH] Fixing some issues with piler-docker --- config/piler-ssl.yml | 3 ++- install-piler.sh | 21 +++++++++++---------- piler.conf.example | 4 ++++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/config/piler-ssl.yml b/config/piler-ssl.yml index 83cbba0..a943015 100644 --- a/config/piler-ssl.yml +++ b/config/piler-ssl.yml @@ -25,7 +25,8 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: - - DEFAULT_EMAIL=${LETSENCRYPT_EMAIL} + - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL} + - LETSENCRYPT_TESTING=${LETSENCRYPT_TESTING:false} mysql: image: mariadb:${MARIA_DB_VERSION} diff --git a/install-piler.sh b/install-piler.sh index 52400d8..48ddb5c 100644 --- a/install-piler.sh +++ b/install-piler.sh @@ -341,17 +341,18 @@ echo cd $installPth -if [ "$USE_LETSENCRYPT" = "yes" ]; then - if ! docker network ls | grep -o "nginx-proxy"; then - docker network create nginx-proxy +# Unused??? +# if [ "$USE_LETSENCRYPT" = "yes" ]; then +# if ! docker network ls | grep -o "nginx-proxy"; then +# docker network create nginx-proxy - echo - echo "${blue}${HLINE}" - echo "${blue} docker network created" - echo "${blue}${HLINE}${normal}" - echo - fi -fi +# echo +# echo "${blue}${HLINE}" +# echo "${blue} docker network created" +# echo "${blue}${HLINE}${normal}" +# echo +# fi +# fi if [ $COMPOSE_VERSION = native ]; then docker compose up -d diff --git a/piler.conf.example b/piler.conf.example index b4e1a3c..3b4afe7 100644 --- a/piler.conf.example +++ b/piler.conf.example @@ -49,6 +49,10 @@ USE_LETSENCRYPT="yes" LETSENCRYPT_EMAIL="admin@example.com" +# Let's Encrypt Testing (staging) server usage + +LETSENCRYPT_TESTING=false + # ------ optional Mailcow Settings -------- # if Use Mailcow API Options set "true"