diff --git a/README.md b/README.md index 4eb53d3..da85fe8 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ The source of this image can be found on ``` docker run -e DOMAIN=example.com \ -e EMAIL=root@example.com \ - ungleich/ungleich-certbot:1.0.0 + ungleich/ungleich-certbot:1.1.1 ``` ### Production certificate @@ -41,12 +41,28 @@ Use docker run -e DOMAIN=example.com \ -e EMAIL=root@example.com \ -e STAGING=no \ - ungleich/ungleich-certbot:1.0.0 + ungleich/ungleich-certbot:1.1.1 ``` you will get a proper, real world usable nginx server. Inject the nginx configuration by meains of a volume to /etc/nginx/conf.d +### Adding or overriding nginx configurations + +To add your own nginx configurations, create the directory +/nginx-configs and add your configurations in there: + +``` +docker run -e DOMAIN=example.com \ + -e EMAIL=root@example.com \ + -v /path/to/config:/nginx-configs \ + ungleich/ungleich-certbot:1.1.1 +``` + +By default this image is deploying the *default.conf*. If you want to +override the default image nginx configuration, you can supply your +own default.conf. + ### Exiting after getting the certificate By default, the container will stay alive and try to renew the @@ -100,6 +116,15 @@ Added support for nginx webserver, based on official nginx image now) -- can be overwritten by overriding /nginx directory - Dropped support for ONLYRENEWCERTS - this is covered by NO_NGINX already +### 1.1.0 + +- Allow better way to inject configurations + +### 1.1.1 + +- Fix incorrect configuration sourcing + + ## Kubernetes See https://code.ungleich.ch/ungleich-public/ungleich-k8s/. diff --git a/entrypoint.sh b/entrypoint.sh index 1ed0508..1f4552b 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -66,6 +66,13 @@ fi if [ "$NO_NGINX" ]; then sleep infinity else + # First builtin cp /nginx/* /etc/nginx/conf.d + + # Then user provided + if [ -d /nginx-configs ]; then + cp /nginx-configs/* /etc/nginx/conf.d + fi + nginx -g "daemon off;" fi