From bd61ca5ec621c7ed518d2e5cdb76ceead48ed534 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sat, 16 Nov 2019 14:34:15 +0100 Subject: [PATCH] Remove usage of -connect argument Setting the argument is not necessary anymore, because the default values are taken from the environment. --- entrypoint.sh | 2 +- nnev-website-supervisor.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 8606f1c..aefd10a 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e cd /tmp/go/src/github.com/nnev/website/www -termine -hook=/build_website.sh -connect="dbname=nnev host=$PGHOST sslmode=disable" next 4 +termine -hook=/build_website.sh next 4 jekyll build exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf diff --git a/nnev-website-supervisor.conf b/nnev-website-supervisor.conf index 5bb397b..4c265d0 100644 --- a/nnev-website-supervisor.conf +++ b/nnev-website-supervisor.conf @@ -5,13 +5,13 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 [program:c14h] -command=/tmp/go/bin/c14h -template=/tmp/go/src/github.com/nnev/website/www/_site/edit_c14.html -listen=localhost:6725 -connect="dbname=nnev host=%(ENV_PGHOST)s sslmode=disable" -hook=/build_website.sh +command=/tmp/go/bin/c14h -template=/tmp/go/src/github.com/nnev/website/www/_site/edit_c14.html -listen=localhost:6725 -hook=/build_website.sh redirect_stderr=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 [program:yarpnarp] -command=/tmp/go/bin/yarpnarp -template=/tmp/go/src/github.com/nnev/website/www/_site/yarpnarp.html -listen=localhost:5417 -connect="dbname=nnev host=%(ENV_PGHOST)s sslmode=disable" -hook=/build_website.sh +command=/tmp/go/bin/yarpnarp -template=/tmp/go/src/github.com/nnev/website/www/_site/yarpnarp.html -listen=localhost:5417 -hook=/build_website.sh redirect_stderr=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0