diff --git a/scripts/install.ps1 b/scripts/install.ps1 index 465a73f3b..fc782459e 100644 --- a/scripts/install.ps1 +++ b/scripts/install.ps1 @@ -24,7 +24,7 @@ if($domain -ne "localhost") { } docker run -it --rm --name certbot -p 80:80 -v $outputDir/letsencrypt:/etc/letsencrypt/ certbot/certbot ` certonly --standalone --noninteractive --agree-tos --preferred-challenges http --email $email -d $domain ` - --logs-dir /etc/letsencrypt/logs --staging + --logs-dir /etc/letsencrypt/logs } } diff --git a/scripts/install.sh b/scripts/install.sh index 48b504ac2..ce974c973 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -21,9 +21,10 @@ then if [ "$LETS_ENCRYPT" == "y" ] then read -p "(!) Enter your email address (Let's Encrypt will send you certificate expiration reminders): " EMAIL - mkdir -p $OUTPUT_DIR/letsencrypt/live/$DOMAIN + mkdir -p $OUTPUT_DIR/letsencrypt docker run -it --rm --name certbot -p 80:80 -v $OUTPUT_DIR/letsencrypt:/etc/letsencrypt/ certbot/certbot \ - certonly --standalone --noninteractive --agree-tos --preferred-challenges http --email $EMAIL -d $DOMAIN + certonly --standalone --noninteractive --agree-tos --preferred-challenges http --email $EMAIL -d $DOMAIN \ + --logs-dir /etc/letsencrypt/logs fi fi diff --git a/scripts/run.ps1 b/scripts/run.ps1 index 1cb977429..0dce004a6 100644 --- a/scripts/run.ps1 +++ b/scripts/run.ps1 @@ -14,7 +14,7 @@ docker-compose --version $letsEncryptPath = "${outputDir}/letsencrypt" if(Test-Path -Path $letsEncryptPath) { docker run -it --rm --name certbot -p 443:443 -p 80:80 -v $outputDir/letsencrypt:/etc/letsencrypt/ certbot/certbot ` - renew --logs-dir /etc/letsencrypt/logs --staging + renew --logs-dir /etc/letsencrypt/logs } docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.macwin.yml down diff --git a/scripts/run.sh b/scripts/run.sh index 7f114942a..d3d9af290 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -24,11 +24,11 @@ fi docker --version docker-compose --version -LETS_ENCRYPT_LIVE = "${outputDir}/letsencrypt/live" -if [ -d "$LETS_ENCRYPT_LIVE" ] +LETS_ENCRYPT_PATH = "${outputDir}/letsencrypt" +if [ -d "LETS_ENCRYPT_PATH" ] then docker run -it --rm --name certbot -p 443:443 -p 80:80 -v $OUTPUT_DIR/letsencrypt:/etc/letsencrypt/ certbot/certbot \ - renew + renew --logs-dir /etc/letsencrypt/logs fi docker-compose -f $DOCKER_DIR/docker-compose.yml -f $DOCKER_DIR/docker-compose.$OS.yml down